diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-08-31 17:16:11 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-08-31 17:16:11 +0000 |
| commit | b80770b23f7c285fb7c04e3e86dc5f2bb2a1cf11 (patch) | |
| tree | 3b7b9b7146a0bd23b9111a84a03f7d21bf8cec27 /nptl/sysdeps/pthread | |
| parent | bee2df0bb966087d7f57d935a4234ffe30c76196 (diff) | |
| download | glibc-b80770b23f7c285fb7c04e3e86dc5f2bb2a1cf11.tar.gz glibc-b80770b23f7c285fb7c04e3e86dc5f2bb2a1cf11.tar.xz glibc-b80770b23f7c285fb7c04e3e86dc5f2bb2a1cf11.zip | |
* dlfcn/Makefile (LDLIBS-bug-atexit3-lib.so): Add cvs/fedora-glibc-20060831T1812
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".
Diffstat (limited to 'nptl/sysdeps/pthread')
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_rwlock_wrlock.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c b/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c index ab7bc7babb..97c0598f96 100644 --- a/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c +++ b/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003. @@ -40,9 +40,7 @@ pthread_rwlock_timedwrlock (rwlock, abstime) int err; /* Get the rwlock if there is no writer and no reader. */ - if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0 - && (rwlock->__data.__flags != 0 - || rwlock->__data.__nr_readers_queued == 0)) + if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0) { /* Mark self as writer. */ rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); diff --git a/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c b/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c index 4d967f2496..822aeed79c 100644 --- a/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c +++ b/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003. @@ -37,9 +37,7 @@ __pthread_rwlock_wrlock (rwlock) while (1) { /* Get the rwlock if there is no writer and no reader. */ - if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0 - && (rwlock->__data.__flags != 0 - || rwlock->__data.__nr_readers_queued == 0)) + if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0) { /* Mark self as writer. */ rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); |