diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-05-04 10:05:57 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-05-04 10:05:57 +0000 |
| commit | 2a0a747e57ec96bab9d4a6b7c0b32df82a41316e (patch) | |
| tree | 002d92f89d7109abc1c2ebe7f113f8dee0dc3034 /nptl/pthread_mutex_trylock.c | |
| parent | af5726aed8a0c87d7f29570641cf0acb6a92f918 (diff) | |
| download | glibc-2a0a747e57ec96bab9d4a6b7c0b32df82a41316e.tar.gz glibc-2a0a747e57ec96bab9d4a6b7c0b32df82a41316e.tar.xz glibc-2a0a747e57ec96bab9d4a6b7c0b32df82a41316e.zip | |
Updated to fedora-glibc-20070504T0917 cvs/fedora-glibc-2_5_90-22
Diffstat (limited to 'nptl/pthread_mutex_trylock.c')
| -rw-r--r-- | nptl/pthread_mutex_trylock.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c index 94d519233b..4990ecd711 100644 --- a/nptl/pthread_mutex_trylock.c +++ b/nptl/pthread_mutex_trylock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -58,12 +58,6 @@ __pthread_mutex_trylock (mutex) break; case PTHREAD_MUTEX_ERRORCHECK_NP: - /* Check whether we already hold the mutex. */ - if (__builtin_expect (mutex->__data.__owner == id, 0)) - return EDEADLK; - - /* FALLTHROUGH */ - case PTHREAD_MUTEX_TIMED_NP: case PTHREAD_MUTEX_ADAPTIVE_NP: /* Normal mutex. */ @@ -76,7 +70,6 @@ __pthread_mutex_trylock (mutex) return 0; - case PTHREAD_MUTEX_ROBUST_RECURSIVE_NP: case PTHREAD_MUTEX_ROBUST_ERRORCHECK_NP: case PTHREAD_MUTEX_ROBUST_NORMAL_NP: |