From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 29 Mar 2011 19:11:25 +0000 (-0400)
Subject: revert mutex "optimization" that turned out to be worse
X-Git-Tag: v0.7.5~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8524d6536c7bcb893115c0c48982c7311906c1db;p=oweals%2Fmusl.git

revert mutex "optimization" that turned out to be worse
---

diff --git a/src/thread/pthread_mutex_trylock.c b/src/thread/pthread_mutex_trylock.c
index 232e172b..50a815a5 100644
--- a/src/thread/pthread_mutex_trylock.c
+++ b/src/thread/pthread_mutex_trylock.c
@@ -7,7 +7,7 @@ int pthread_mutex_trylock(pthread_mutex_t *m)
 	pthread_t self;
 
 	if (m->_m_type == PTHREAD_MUTEX_NORMAL)
-		return (m->_m_lock || a_swap(&m->_m_lock, 1)) ? EBUSY : 0;
+		return -a_swap(&m->_m_lock, 1) & EBUSY;
 
 	self = pthread_self();
 	tid = self->tid | 0x80000000;