Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Linus Torvalds 2006-01-11 15:50:47 -08:00
parent 7e4e574c39
commit 4cec873614
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/asm-generic/mutex-dec.h
View file

@ -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;
} }

2
include/asm-i386/mutex.h
View file

@ -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

2
include/asm-x86_64/mutex.h
View file

@ -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;