[commits] r5976 - in /trunk/libc: ./ nptl/ nptl/sysdeps/unix/sysv/linux/sparc/sparc32/ sysdeps/unix/sysv/linux/

[joseph@xxxxxxxxxx]

Author: joseph
Date: Fri Apr 18 02:27:39 2008
New Revision: 5976

Log:
Merge changes between r5900 and r5975 from /fsf/trunk.

Modified:
    trunk/libc/ChangeLog
    trunk/libc/nptl/ChangeLog
    trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c
    trunk/libc/sysdeps/unix/sysv/linux/dl-osinfo.h

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Fri Apr 18 02:27:39 2008
@@ -1,3 +1,7 @@
+2008-04-17  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/dl-osinfo.h: Include fcntl.h.
+
 2008-04-11  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/powerpc/bits/mathinline.h (__signbitl):

Modified: trunk/libc/nptl/ChangeLog
==============================================================================
--- trunk/libc/nptl/ChangeLog (original)
+++ trunk/libc/nptl/ChangeLog Fri Apr 18 02:27:39 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: trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c
==============================================================================
--- trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c (original)
+++ trunk/libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c Fri Apr 18 02:27:39 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.  */

Modified: trunk/libc/sysdeps/unix/sysv/linux/dl-osinfo.h
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/dl-osinfo.h (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/dl-osinfo.h Fri Apr 18 02:27:39 2008
@@ -19,6 +19,7 @@
 
 #include <kernel-features.h>
 #include <dl-sysdep.h>
+#include <fcntl.h>
 #include <stdint.h>
 
 #ifndef MIN