From 73f7c32c47ab2397935d9fc2aeaa594794b38c7e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 2 Sep 2004 18:59:24 +0000 Subject: [BZ #357] Update. 2004-09-02 Steven Munroe [BZ #357] * stdlib/tst-setcontext.c (test_stack): Added test for stack clobber. (main): Call test_stack. * sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S (__getcontext): Push stack frame then save parms in local frame. Improve instruction scheduling. * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S (__swapcontext): Likewise. --- nptl/pthread_cond_init.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'nptl/pthread_cond_init.c') diff --git a/nptl/pthread_cond_init.c b/nptl/pthread_cond_init.c index f5fbd64e96..03ac59dbd2 100644 --- a/nptl/pthread_cond_init.c +++ b/nptl/pthread_cond_init.c @@ -32,8 +32,9 @@ __pthread_cond_init (cond, cond_attr) cond->__data.__lock = LLL_MUTEX_LOCK_INITIALIZER; cond->__data.__futex = 0; - cond->__data.__clock = (icond_attr == NULL - ? CLOCK_REALTIME : (icond_attr->value & 0xfe) >> 1); + cond->__data.__nwaiters = (icond_attr != NULL + && ((icond_attr->value & (COND_CLOCK_BITS << 1)) + >> 1)); cond->__data.__total_seq = 0; cond->__data.__wakeup_seq = 0; cond->__data.__woken_seq = 0; -- cgit v1.2.3