diff options
author | Jakub Jelinek <jakub@redhat.com> | 2008-04-30 12:11:31 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2008-04-30 12:11:31 +0000 |
commit | ef73dbc1301bc42c132d15ae6ca866233c0beeb4 (patch) | |
tree | 7386ab88c4f2c43ac417a2ea0b0b19239bdc0b19 /nptl | |
parent | 14e44061ad888abbea7239599a9109b41776e41c (diff) |
Diffstat (limited to 'nptl')
-rw-r--r-- | nptl/ChangeLog | 5 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 63b0eab9c3..ba94a95dac 100644 --- a/nptl/ChangeLog +++ b/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/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c index 3c71c969b8..b14f976a61 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c +++ b/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. */ |