Update.

2003-05-30  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/ia64/lowlevellock.h
	(__lll_mutex_cond_lock): Add one to value parameter of
	__lll_lock_wait to reflect reality in the futex syscall.
	* sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
	(lll_mutex_cond_lock): Likewise.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index e4c7a55794c2f59586164232edadf2f23d0ead49..44c6ca908eb2d6c40286a1724bb25afb60fcb695 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-30  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/ia64/lowlevellock.h
+       (__lll_mutex_cond_lock): Add one to value parameter of
+       __lll_lock_wait to reflect reality in the futex syscall.
+       * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
+       (lll_mutex_cond_lock): Likewise.
+
 2003-05-30  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/unix/sysv/linux/s390/lowlevellock.h (__lll_mutex_cond_lock):

diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
index 525869b302544085fa54c226271d52b9c8a24314..b7f018b9a141bfa7cade6d1079106b7d84947177 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
@@ -142,7 +142,10 @@ __lll_mutex_cond_lock (int *futex)
   int val = atomic_exchange_and_add (futex, 2);
 
   if (__builtin_expect (val != 0, 0))
-    __lll_lock_wait (futex, val);
+    /* Note, the val + 1 is kind of ugly here.  __lll_lock_wait will add
+       1 again.  But we added 2 to the futex value so this is the right
+       value which will be passed to the kernel.  */
+    __lll_lock_wait (futex, val + 1);
 }
 #define lll_mutex_cond_lock(futex) __lll_mutex_cond_lock (&(futex))