diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-07-28 09:21:54 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-07-28 09:21:54 +0200 |
| commit | b14f097d7ef032db746b885ec05b167e54b8fa9c (patch) | |
| tree | ec0cb2d8a2de784ed9d709ecdf9cc82dd1815fe1 /nptl/pthread_mutex_unlock.c | |
| parent | e1214916e74fa6aa7984cb78e68c38d49e5834a6 (diff) | |
| parent | e73e694e38b7b222eec3ec5897eb507d88bb8928 (diff) | |
| download | glibc-b14f097d7ef032db746b885ec05b167e54b8fa9c.tar glibc-b14f097d7ef032db746b885ec05b167e54b8fa9c.tar.gz glibc-b14f097d7ef032db746b885ec05b167e54b8fa9c.tar.bz2 glibc-b14f097d7ef032db746b885ec05b167e54b8fa9c.zip | |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'nptl/pthread_mutex_unlock.c')
| -rw-r--r-- | nptl/pthread_mutex_unlock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c index 0028c5583f..fbe8274a55 100644 --- a/nptl/pthread_mutex_unlock.c +++ b/nptl/pthread_mutex_unlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2005-2007, 2008 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2005-2008, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -213,7 +213,7 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr) /* Unlock. */ if ((mutex->__data.__lock & FUTEX_WAITERS) != 0 - || atomic_compare_and_exchange_bool_acq (&mutex->__data.__lock, 0, + || atomic_compare_and_exchange_bool_rel (&mutex->__data.__lock, 0, THREAD_GETMEM (THREAD_SELF, tid))) { @@ -263,7 +263,7 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr) oldval = mutex->__data.__lock; newval = oldval & PTHREAD_MUTEX_PRIO_CEILING_MASK; } - while (atomic_compare_and_exchange_bool_acq (&mutex->__data.__lock, + while (atomic_compare_and_exchange_bool_rel (&mutex->__data.__lock, newval, oldval)); if ((oldval & ~PTHREAD_MUTEX_PRIO_CEILING_MASK) > 1) |