aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads/condvar.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-04-17 07:09:10 +0000
committerUlrich Drepper <drepper@redhat.com>2000-04-17 07:09:10 +0000
commite3265f5bc52f21b7da063813b4d0134a343e9a28 (patch)
tree61599d90f67cef6ee844ac1137faa3ec95330817 /linuxthreads/condvar.c
parente2947c429eaf51b7c0645e9484d70f141ba560d6 (diff)
downloadglibc-e3265f5bc52f21b7da063813b4d0134a343e9a28.zip
glibc-e3265f5bc52f21b7da063813b4d0134a343e9a28.tar.gz
glibc-e3265f5bc52f21b7da063813b4d0134a343e9a28.tar.bz2
Update.
2000-04-17 Ulrich Drepper <drepper@redhat.com> * elf/dl-lookup.c (add_dependency): Correct __builtin_expect use.
Diffstat (limited to 'linuxthreads/condvar.c')
-rw-r--r--linuxthreads/condvar.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/linuxthreads/condvar.c b/linuxthreads/condvar.c
index a06517c..ab107c1 100644
--- a/linuxthreads/condvar.c
+++ b/linuxthreads/condvar.c
@@ -121,11 +121,9 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond,
pthread_extricate_if extr;
/* Check whether the mutex is locked and owned by this thread. */
- if (mutex->__m_owner != self)
+ if (mutex->__m_kind != PTHREAD_MUTEX_FAST_NP && mutex->__m_owner != self)
return EINVAL;
- already_canceled = 0;
-
/* Set up extrication interface */
extr.pu_object = cond;
extr.pu_extricate_func = cond_extricate_func;
@@ -149,7 +147,7 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond,
pthread_mutex_unlock(mutex);
- if (!timedsuspend(self, abstime) == 0) {
+ if (!timedsuspend(self, abstime)) {
int was_on_queue;
/* __pthread_lock will queue back any spurious restarts that