Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

include/asm-generic/mutex-dec.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ __mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *)) 
	 * the mutex state would be.

	 */

#ifdef __HAVE_ARCH_CMPXCHG

	if (likely(atomic_cmpxchg(count, 1, 0)) == 1) {

	if (likely(atomic_cmpxchg(count, 1, 0) == 1)) {

		smp_mb();

		return 1;

	}

include/asm-i386/mutex.h

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ __mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *)) 
	 * the mutex state would be.

	 */

#ifdef __HAVE_ARCH_CMPXCHG

	if (likely(atomic_cmpxchg(count, 1, 0)) == 1)

	if (likely(atomic_cmpxchg(count, 1, 0) == 1))

		return 1;

	return 0;

#else

include/asm-x86_64/mutex.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ do { \ 
static inline int

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

	else

		return 0;