aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-08-16 21:03:08 +0000
committerJakub Jelinek <jakub@redhat.com>2007-08-16 21:03:08 +0000
commit3e8d1eabc985a5804681506d79187829774885ad (patch)
tree8e5ebbc86dfb0b3ad255c316f69ed12ef0fadaa6 /nptl
parent91ddd9c44807742aba0fd255b0345bbb547e1d50 (diff)
downloadglibc-3e8d1eabc985a5804681506d79187829774885ad.tar
glibc-3e8d1eabc985a5804681506d79187829774885ad.tar.gz
glibc-3e8d1eabc985a5804681506d79187829774885ad.tar.bz2
glibc-3e8d1eabc985a5804681506d79187829774885ad.zip
* 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-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.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog7
-rw-r--r--nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h4
2 files changed, 9 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 93f80826ba..f130a7c7b9 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); \
})