From 672ec465f2f3a2807a189daf03ffe011c14a466d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 2 Mar 2006 00:28:24 +0000 Subject: [PATCH] * sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S (__lll_robust_lock_wait): Also set FUTEX_WAITERS bit if we got the mutex. (__lll_robust_timedlock_wait): Likewise. * sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S (__lll_robust_lock_wait): Likewise. (__lll_robust_timedlock_wait): Likewise. * sysdeps/unix/sysv/linux/lowlevelrobustlock.c (__lll_robust_lock_wait): Likewise. (__lll_robust_timedlock_wait): Likewise. --- nptl/ChangeLog | 13 +++++++++++++ nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S | 2 ++ 2 files changed, 15 insertions(+) diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 84d9b71..f5c5299 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,16 @@ +2006-03-01 Ulrich Drepper + + * sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S + (__lll_robust_lock_wait): Also set FUTEX_WAITERS bit if we got the + mutex. + (__lll_robust_timedlock_wait): Likewise. + * sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S + (__lll_robust_lock_wait): Likewise. + (__lll_robust_timedlock_wait): Likewise. + * sysdeps/unix/sysv/linux/lowlevelrobustlock.c + (__lll_robust_lock_wait): Likewise. + (__lll_robust_timedlock_wait): Likewise. + 2006-03-01 Jakub Jelinek * sysdeps/unix/sysv/linux/sparc/lowlevellock.h (lll_robust_mutex_dead, diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S index 7bb9191..1a088e2 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S @@ -78,6 +78,7 @@ __lll_robust_mutex_lock_wait: jne 4b movl %fs:TID, %edx + orl $FUTEX_WAITERS, %edx LOCK cmpxchgl %edx, (%rdi) jnz 4b @@ -169,6 +170,7 @@ __lll_robust_mutex_timedlock_wait: jne 7f movl %fs:TID, %edx + orl $FUTEX_WAITERS, %edx LOCK cmpxchgl %edx, (%r12) jnz 7f -- 2.7.4