diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-08-16 22:08:56 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-08-16 22:08:56 +0000 |
| commit | 9b0cdd693e7f54fd35fd58931b940efe6ccb88cd (patch) | |
| tree | c9441514de089a1f5135e442d01cfbc1c4da1416 /nptl | |
| parent | 91ed9442cea3802c96b69553d6653ed01df7c990 (diff) | |
| download | glibc-9b0cdd693e7f54fd35fd58931b940efe6ccb88cd.tar.gz | |
Updated to fedora-glibc-20070816T2121cvs/fedora-glibc-2_6_90-11
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 3e4ca2333e..4edb7af9ab 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2007-08-16 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/unix/sysv/linux/alpha/lowlevellock.h + (__lll_robust_timedlock): Pass private as last argument to + __lll_robust_timedlock_wait. + (__lll_unlock): Fix a pasto. + 2007-08-15 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/sparc/internaltypes.h (sparc_new_sem, diff --git a/nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h index 4487607bb3..9fa321cb3f 100644 --- a/nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h @@ -219,7 +219,7 @@ __lll_robust_timedlock (int *futex, const struct timespec *abstime, { int result = 0; if (atomic_compare_and_exchange_bool_acq (futex, id, 0) != 0) - result = __lll_robust_timedlock_wait (futex, abstime); + result = __lll_robust_timedlock_wait (futex, abstime, private); return result; } #define lll_robust_timedlock(futex, abstime, id, private) \ @@ -229,7 +229,7 @@ __lll_robust_timedlock (int *futex, const struct timespec *abstime, #define __lll_unlock(futex, private) \ (void) \ ({ int *__futex = (futex); \ - ({ int __oldval = atomic_exchange_rel (__futex, 0); \ + int __oldval = atomic_exchange_rel (__futex, 0); \ if (__builtin_expect (__oldval > 1, 0)) \ lll_futex_wake (__futex, 1, private); \ }) |