Update.

	* sysdeps/unix/sysv/linux/ia64/lowlevellock.h: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: Likewise.
	* sysdeps/unix/sysv/linux/lowlevellock.c: Likewise.
	* sysdeps/pthread/pthread_cond_signal.c: Don't use requeue.

1 files changed, 10 insertions, 12 deletions

diff --git a/nptl/sysdeps/unix/sysv/linux/lowlevellock.c b/nptl/sysdeps/unix/sysv/linux/lowlevellock.c
index b92df1b401..5021cdf4ba 100644
--- a/nptl/sysdeps/unix/sysv/linux/lowlevellock.c
+++ b/nptl/sysdeps/unix/sysv/linux/lowlevellock.c
@@ -25,22 +25,20 @@
 
 
 void
-__lll_lock_wait (int *futex, int val)
+__lll_lock_wait (int *futex)
 {
-  /* In the loop we are going to add 2 instead of 1 which is what
-     the caller did.  Account for that.  */
-  --val;
   do
     {
-      lll_futex_wait (futex, val + 2);
-      val = atomic_exchange_and_add (futex, 2);
+      int oldval = atomic_compare_and_exchange_val_acq (futex, 2, 1);
+      if (oldval != 0)
+	lll_futex_wait (futex, 2);
     }
-  while (val != 0);
+  while (atomic_compare_and_exchange_bool_acq (futex, 2, 0) != 0);
 }
 
 
 int
-__lll_timedlock_wait (int *futex, int val, const struct timespec *abstime)
+__lll_timedlock_wait (int *futex, const struct timespec *abstime)
 {
   /* Reject invalid timeouts.  */
   if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
@@ -68,12 +66,12 @@ __lll_timedlock_wait (int *futex, int val, const struct timespec *abstime)
 	return ETIMEDOUT;
 
       /* Wait.  */
-      if (lll_futex_timed_wait (futex, val + 1, &rt) == -ETIMEDOUT)
-	return ETIMEDOUT;
+      int oldval = atomic_compare_and_exchange_val_acq (futex, 2, 1);
+      if (oldval != 0)
+	lll_futex_wait (futex, 2);
     }
-  while ((val = atomic_exchange_and_add (futex, 1)) != 0);
+  while (atomic_compare_and_exchange_bool_acq (futex, 2, 0) != 0);
 
-  *futex = 2;
   return 0;
 }