From b80770b23f7c285fb7c04e3e86dc5f2bb2a1cf11 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 31 Aug 2006 17:16:11 +0000 Subject: * dlfcn/Makefile (LDLIBS-bug-atexit3-lib.so): Add ld.so. * malloc/malloc.c (_int_malloc): Use full list insert and not shortcut which assumes the list is empty for large requests too. * elf/tst-addr1.c (do_test): Allow i.dli_sname "_IO_printf". --- nptl/pthread_rwlock_trywrlock.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'nptl/pthread_rwlock_trywrlock.c') diff --git a/nptl/pthread_rwlock_trywrlock.c b/nptl/pthread_rwlock_trywrlock.c index 63760064c5..b754a19565 100644 --- a/nptl/pthread_rwlock_trywrlock.c +++ b/nptl/pthread_rwlock_trywrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -30,10 +30,7 @@ __pthread_rwlock_trywrlock (rwlock) lll_mutex_lock (rwlock->__data.__lock); - if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0 - /* Respect the preference. */ - && (rwlock->__data.__flags != 0 - || rwlock->__data.__nr_readers_queued == 0)) + if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0) { rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); result = 0; -- cgit v1.2.3