alpha: Fix mixed up args in EXC macro in futex operations
authorMichael Cree <mcree@orcon.net.nz>
Fri, 24 Nov 2017 08:25:01 +0000 (21:25 +1300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 16 Feb 2018 19:23:07 +0000 (20:23 +0100)
commit 84e455361ec97ea6037d31d42a2955628ea2094b upstream.

Fix the typo (mixed up arguments) in the EXC macro in the futex
definitions introduced by commit ca282f697381 (alpha: add a
helper for emitting exception table entries).

Signed-off-by: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/alpha/include/asm/futex.h

index d2e4da9..ca33225 100644 (file)
@@ -20,8 +20,8 @@
        "3:     .subsection 2\n"                                \
        "4:     br      1b\n"                                   \
        "       .previous\n"                                    \
-       EXC(1b,3b,%1,$31)                                       \
-       EXC(2b,3b,%1,$31)                                       \
+       EXC(1b,3b,$31,%1)                                       \
+       EXC(2b,3b,$31,%1)                                       \
        :       "=&r" (oldval), "=&r"(ret)                      \
        :       "r" (uaddr), "r"(oparg)                         \
        :       "memory")
@@ -82,8 +82,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
        "3:     .subsection 2\n"
        "4:     br      1b\n"
        "       .previous\n"
-       EXC(1b,3b,%0,$31)
-       EXC(2b,3b,%0,$31)
+       EXC(1b,3b,$31,%0)
+       EXC(2b,3b,$31,%0)
        :       "+r"(ret), "=&r"(prev), "=&r"(cmp)
        :       "r"(uaddr), "r"((long)(int)oldval), "r"(newval)
        :       "memory");