sh: fixed cmpxchg gRB version

This patch fixes a bug within the cmpxchg GRB version.

A problem was notices while running some tests to stress
the priority inheritance, for example pi_stress
(http://rt.wiki.kernel.org/index.php/PI_Mutex_Test).

Also, without this patch, after applying the latest work to
consolidate atomic_cmpxchg() definitions (commit:
8c0b8139c87cfe8b95c6e763b4ca3190aa9b1ad0)
the Kernel doesn't boot at all.

Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/include/asm/cmpxchg-grb.h b/arch/sh/include/asm/cmpxchg-grb.h
index e2681abe764f49f625966abb08cd9a47655d9797..4676bf57693a0ec3daf573d885731cfe7ed21963 100644 (file)
--- a/arch/sh/include/asm/cmpxchg-grb.h
+++ b/arch/sh/include/asm/cmpxchg-grb.h
@@ -57,11 +57,10 @@ static inline unsigned long __cmpxchg_u32(volatile int *m, unsigned long old,
                "   mov.l  @%1,   %0      \n\t" /* load  old value */
                "   cmp/eq  %0,   %2      \n\t"
                "   bf            1f      \n\t" /* if not equal */
-               "   mov.l   %2,   @%1     \n\t" /* store new value */
+               "   mov.l   %3,   @%1     \n\t" /* store new value */
                "1: mov     r1,   r15     \n\t" /* LOGOUT */
-               : "=&r" (retval),
-                 "+r"  (m)
-               : "r"   (new)
+               : "=&r" (retval)
+               :  "r"  (m), "r"  (old), "r"  (new)
                : "memory" , "r0", "r1", "t");
 
        return retval;