summaryrefslogtreecommitdiff
path: root/libpthread/nptl/pthread_mutex_lock.c
diff options
context:
space:
mode:
authorRoman I Khimov <khimov@altell.ru>2010-04-30 18:18:32 +0400
committerAustin Foxley <austinf@cetoncorp.com>2010-05-03 13:35:59 -0700
commite928e223fd44f0002c035773f9c40d8aad78323c (patch)
treef42ebbe5846e8e3eb393983825ae0bb5ae80a3a3 /libpthread/nptl/pthread_mutex_lock.c
parentbb1a6cbd0ef6965e7a3eb65a4d8284c38be2fc19 (diff)
nptl: use arch-specific pthread_cond_timedwait and pthread_cond_wait on x86_64
Generic ones were broken on x86_64, pthread/ex2 test failed while pthread/ex5 worked fine. So use arch-specific functions and fix linkage failure with __pthread_mutex_cond_lock_adjust. Signed-off-by: Roman I Khimov <khimov@altell.ru> Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libpthread/nptl/pthread_mutex_lock.c')
-rw-r--r--libpthread/nptl/pthread_mutex_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpthread/nptl/pthread_mutex_lock.c b/libpthread/nptl/pthread_mutex_lock.c
index 6abf3236e..78b66711c 100644
--- a/libpthread/nptl/pthread_mutex_lock.c
+++ b/libpthread/nptl/pthread_mutex_lock.c
@@ -477,7 +477,7 @@ strong_alias (__pthread_mutex_lock, __pthread_mutex_lock_internal)
#ifdef NO_INCR
-void
+void attribute_protected
__pthread_mutex_cond_lock_adjust (
pthread_mutex_t *mutex)
{