]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Fix i386 build for lll_unlock_elision change.
authorJoseph Myers <joseph@codesourcery.com>
Tue, 12 Apr 2016 22:03:00 +0000 (17:03 -0500)
committerPaul E. Murphy <murphyp@linux.vnet.ibm.com>
Tue, 12 Apr 2016 22:03:00 +0000 (17:03 -0500)
Tested for i386.

* sysdeps/unix/sysv/linux/i386/lowlevellock.h
(lll_unlock_elision): Add adapt_count parameter.

(cherry picked from commit 5ef193391bb0916ec03f0f06a9b1fe0b00591ad8)

ChangeLog
sysdeps/unix/sysv/linux/i386/lowlevellock.h

index 93a5ed6da52e1c95fb460e22d61953dd4db94545..3d88d7913fd048d5812ebb7dafa5ee0679677378 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-12  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/i386/lowlevellock.h
+       (lll_unlock_elision): Add adapt_count parameter.
+
 2016-04-12  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>
 
        * sysdeps/unix/sysv/linux/powerpc/elision-lock.c
index 58f5638e37ce9d8e6bab8e39c7211fa564dbf1f4..b8ccd31c0f3dc6104631c8853adbe7a5d402e7cb 100644 (file)
@@ -317,7 +317,7 @@ extern int __lll_trylock_elision(int *lock, short *adapt_count)
 
 #define lll_lock_elision(futex, adapt_count, private) \
   __lll_lock_elision (&(futex), &(adapt_count), private)
-#define lll_unlock_elision(futex, private) \
+#define lll_unlock_elision(futex, adapt_count, private) \
   __lll_unlock_elision (&(futex), private)
 #define lll_trylock_elision(futex, adapt_count) \
   __lll_trylock_elision(&(futex), &(adapt_count))