From: Meyer, Kirk Date: Thu, 23 May 2013 17:06:57 +0000 (+0000) Subject: microblaze: Reversed logic in futex cmpxchg X-Git-Tag: v4.0~3980^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f6a12a7d0b1a70e969ae4f6d7c5201cdaf6edde0;p=platform%2Fkernel%2Flinux-amlogic.git microblaze: Reversed logic in futex cmpxchg futex_atomic_cmpxchg_inatomic exchanged if the values were unequal rather than equal. This caused incorrect behavior of robust futexes. Signed-off-by: Kirk Meyer Signed-off-by: Michal Simek --- diff --git a/arch/microblaze/include/asm/futex.h b/arch/microblaze/include/asm/futex.h index ff8cde1..01848f0 100644 --- a/arch/microblaze/include/asm/futex.h +++ b/arch/microblaze/include/asm/futex.h @@ -105,7 +105,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, __asm__ __volatile__ ("1: lwx %1, %3, r0; \ cmp %2, %1, %4; \ - beqi %2, 3f; \ + bnei %2, 3f; \ 2: swx %5, %3, r0; \ addic %2, r0, 0; \ bnei %2, 1b; \