Commit 4cec8736 authored by Linus Torvalds's avatar Linus Torvalds

Fix mutex_trylock() copy-and-paste bug (x86, x86-64, generic mutex-dec.h)

Noticed by Arjan originally on x86-64, then Ingo on x86, and finally me
grepping for it in the generic version.

Bad parenthesis nesting.
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7e4e574c
...@@ -97,7 +97,7 @@ __mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *)) ...@@ -97,7 +97,7 @@ __mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *))
* the mutex state would be. * the mutex state would be.
*/ */
#ifdef __HAVE_ARCH_CMPXCHG #ifdef __HAVE_ARCH_CMPXCHG
if (likely(atomic_cmpxchg(count, 1, 0)) == 1) { if (likely(atomic_cmpxchg(count, 1, 0) == 1)) {
smp_mb(); smp_mb();
return 1; return 1;
} }
......
...@@ -125,7 +125,7 @@ __mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *)) ...@@ -125,7 +125,7 @@ __mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *))
* the mutex state would be. * the mutex state would be.
*/ */
#ifdef __HAVE_ARCH_CMPXCHG #ifdef __HAVE_ARCH_CMPXCHG
if (likely(atomic_cmpxchg(count, 1, 0)) == 1) if (likely(atomic_cmpxchg(count, 1, 0) == 1))
return 1; return 1;
return 0; return 0;
#else #else
......
...@@ -104,7 +104,7 @@ do { \ ...@@ -104,7 +104,7 @@ do { \
static inline int static inline int
__mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *)) __mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *))
{ {
if (likely(atomic_cmpxchg(count, 1, 0)) == 1) if (likely(atomic_cmpxchg(count, 1, 0) == 1))
return 1; return 1;
else else
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment