[commits] r5939 - in /fsf/trunk/libc/nptl: ChangeLog sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Apr 16 00:03:37 2008
New Revision: 5939

Log:
Import glibc-mainline for 2008-04-16

Modified:
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Wed Apr 16 00:03:37 2008
@@ -1,3 +1,8 @@
+2008-04-14  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c
+	(__old_sem_wait): Fix argument to lll_futex_wait().
+
 2007-11-26  Daniel Jacobowitz  <dan@xxxxxxxxxxxxxxxx>
 
 	* pthread_create.c: Require pthread_mutex_trylock and

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c Wed Apr 16 00:03:37 2008
@@ -155,7 +155,7 @@
       /* Enable asynchronous cancellation.  Required by the standard.  */
       int oldtype = __pthread_enable_asynccancel ();
 
-      err = lll_futex_wait (futex, 0,
+      err = lll_futex_wait (&isem->value, 0,
 			    isem->private ^ FUTEX_PRIVATE_FLAG);
 
       /* Disable asynchronous cancellation.  */