diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-04-18 09:27:39 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-04-18 09:27:39 +0000 |
| commit | 2caa692405ec79a44064cbac8086000c95fec8b1 (patch) | |
| tree | 90d76dbb9044fb21ed3a3c92ab7339835051de3a | |
| parent | 696b0873b9fc334635649e7b9cc0aca7cc9deb95 (diff) | |
Merge changes between r5900 and r5975 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@5976 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -rw-r--r-- | libc/ChangeLog | 4 | ||||
| -rw-r--r-- | libc/nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | libc/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/unix/sysv/linux/dl-osinfo.h | 1 |
4 files changed, 11 insertions, 1 deletions
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 <jakub@redhat.com> + + * sysdeps/unix/sysv/linux/dl-osinfo.h: Include fcntl.h. + 2008-04-11 Ulrich Drepper <drepper@redhat.com> * 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 <davem@davemloft.net> + + * sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c + (__old_sem_wait): Fix argument to lll_futex_wait(). + 2007-11-26 Daniel Jacobowitz <dan@codesourcery.com> * 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 <kernel-features.h> #include <dl-sysdep.h> +#include <fcntl.h> #include <stdint.h> #ifndef MIN |