From fb336c7471eef7ded5a7889cac9e031ce7fc28fd Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 12 Apr 2016 17:03:00 -0500 Subject: [PATCH] Fix i386 build for lll_unlock_elision change. Tested for i386. * sysdeps/unix/sysv/linux/i386/lowlevellock.h (lll_unlock_elision): Add adapt_count parameter. (cherry picked from commit 5ef193391bb0916ec03f0f06a9b1fe0b00591ad8) --- ChangeLog | 5 +++++ sysdeps/unix/sysv/linux/i386/lowlevellock.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 93a5ed6da52..3d88d7913fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-04-12 Joseph Myers + + * sysdeps/unix/sysv/linux/i386/lowlevellock.h + (lll_unlock_elision): Add adapt_count parameter. + 2016-04-12 Paul E. Murphy * sysdeps/unix/sysv/linux/powerpc/elision-lock.c diff --git a/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/sysdeps/unix/sysv/linux/i386/lowlevellock.h index 58f5638e37c..b8ccd31c0f3 100644 --- a/sysdeps/unix/sysv/linux/i386/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -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)) -- 2.47.2