* 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.
git-mirror · Mar 2, 2006 · 672ec46 · 672ec46
1 parent 42b6ddf
commit 672ec46
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
@@ -1,3 +1,16 @@
+2006-03-01  Ulrich Drepper  <drepper@redhat.com>
+
+	* 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  <jakub@redhat.com>
 
 	* 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
@@ -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