From 75831cc48d3fef9b0bb247aabbcdaceef85efa23 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 21 May 2007 20:01:15 +0000 Subject: Backported selected fixes from 2007-05-{17,18,21}. --- nptl/pthread_mutex_lock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nptl/pthread_mutex_lock.c') diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c index 52cc47f4cc..1c3ee4fe25 100644 --- a/nptl/pthread_mutex_lock.c +++ b/nptl/pthread_mutex_lock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -127,6 +127,8 @@ __pthread_mutex_lock (mutex) int newval = id; #ifdef NO_INCR newval |= FUTEX_WAITERS; +#else + newval |= (oldval & FUTEX_WAITERS); #endif newval -- cgit v1.2.3