summaryrefslogtreecommitdiff
path: root/libpthread
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-12-06 01:44:58 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-12-06 01:44:58 +0100
commitf115339ad63bfb0005bc3d1ebfb05e1a0aecc0db (patch)
tree30abf5fa5e54f2a079e53228083cf4d230efc102 /libpthread
parent89ea33ceee6c1efe0b07e0deb55e3f494ccf7d99 (diff)
parenta6910ad7c5061c73966d949c9fad2765332ee633 (diff)
Merge branch 'libpthread-moved' into upstream-merged
Diffstat (limited to 'libpthread')
-rw-r--r--libpthread/pthread/cthreads-compat.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libpthread/pthread/cthreads-compat.c b/libpthread/pthread/cthreads-compat.c
index e0536ef2..cbe8170e 100644
--- a/libpthread/pthread/cthreads-compat.c
+++ b/libpthread/pthread/cthreads-compat.c
@@ -100,5 +100,8 @@ __mutex_lock_solid (void *lock)
void
__mutex_unlock_solid (void *lock)
{
+ if (__pthread_spin_trylock (lock) != 0)
+ /* Somebody already got the lock, that one will manage waking up others */
+ return;
__pthread_mutex_unlock (lock);
}