summaryrefslogtreecommitdiff
path: root/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-08-15 20:57:36 +0000
committerJakub Jelinek <jakub@redhat.com>2007-08-15 20:57:36 +0000
commit91ed9442cea3802c96b69553d6653ed01df7c990 (patch)
tree53f0dc462efd0fc02dee924f744744a39041d765 /nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c
parentc67c02731b6507c5351bca70451441d9a26113ef (diff)
Updated to fedora-glibc-20070815T2049cvs/fedora-glibc-2_6_90-10
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c')
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c
index 1ee9b4737b..682307eef1 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c
@@ -36,9 +36,9 @@ __lll_lock_wait_private (int *futex)
while (atomic_compare_and_exchange_val_24_acq (futex, 2, 0) != 0);
}
-#ifdef IS_IN_libpthread
-/* These functions don't get included in libc.so */
+/* These functions don't get included in libc.so */
+#ifdef IS_IN_libpthread
void
__lll_lock_wait (int *futex, int private)
{
@@ -121,8 +121,9 @@ __lll_timedwait_tid (int *tidp, const struct timespec *abstime)
if (rt.tv_sec < 0)
return ETIMEDOUT;
- /* Wait until thread terminates. */
- if (lll_futex_timed_wait (tidp, tid, &rt) == -ETIMEDOUT)
+ /* Wait until thread terminates. The kernel so far does not use
+ the private futex operations for this. */
+ if (lll_futex_timed_wait (tidp, tid, &rt, LLL_SHARED) == -ETIMEDOUT)
return ETIMEDOUT;
}