From 2caa692405ec79a44064cbac8086000c95fec8b1 Mon Sep 17 00:00:00 2001 From: joseph Date: Fri, 18 Apr 2008 09:27:39 +0000 Subject: Merge changes between r5900 and r5975 from /fsf/trunk. git-svn-id: svn://svn.eglibc.org/trunk@5976 7b3dc134-2b1b-0410-93df-9e9f96275f8d --- libc/ChangeLog | 4 ++++ libc/nptl/ChangeLog | 5 +++++ libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c | 2 +- libc/sysdeps/unix/sysv/linux/dl-osinfo.h | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libc/ChangeLog b/libc/ChangeLog index bf841f7b8..873ddb680 100644 --- a/libc/ChangeLog +++ b/libc/ChangeLog @@ -1,3 +1,7 @@ +2008-04-17 Jakub Jelinek + + * sysdeps/unix/sysv/linux/dl-osinfo.h: Include fcntl.h. + 2008-04-11 Ulrich Drepper * sysdeps/unix/sysv/linux/powerpc/bits/mathinline.h (__signbitl): diff --git a/libc/nptl/ChangeLog b/libc/nptl/ChangeLog index 36dd01d57..a1cb40c46 100644 --- a/libc/nptl/ChangeLog +++ b/libc/nptl/ChangeLog @@ -1,3 +1,8 @@ +2008-04-14 David S. Miller + + * sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c + (__old_sem_wait): Fix argument to lll_futex_wait(). + 2007-11-26 Daniel Jacobowitz * pthread_create.c: Require pthread_mutex_trylock and diff --git a/libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c b/libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c index 3c71c969b..b14f976a6 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c +++ b/libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c @@ -155,7 +155,7 @@ __old_sem_wait (sem_t *sem) /* 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. */ diff --git a/libc/sysdeps/unix/sysv/linux/dl-osinfo.h b/libc/sysdeps/unix/sysv/linux/dl-osinfo.h index b13b6cf1d..5271d4e4d 100644 --- a/libc/sysdeps/unix/sysv/linux/dl-osinfo.h +++ b/libc/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -19,6 +19,7 @@ #include #include +#include #include #ifndef MIN -- cgit v1.2.3