summaryrefslogtreecommitdiffstats
path: root/arch/alpha/include/asm
diff options
context:
space:
mode:
authorMichael Cree <mcree@orcon.net.nz>2017-11-24 09:25:01 +0100
committerMatt Turner <mattst88@gmail.com>2018-01-21 02:00:56 +0100
commit84e455361ec97ea6037d31d42a2955628ea2094b (patch)
tree4c3116275739e2a6241f251a58fb6ce67a0b84d1 /arch/alpha/include/asm
parentalpha: osf_sys.c: use timespec64 where appropriate (diff)
downloadlinux-84e455361ec97ea6037d31d42a2955628ea2094b.tar.xz
linux-84e455361ec97ea6037d31d42a2955628ea2094b.zip
alpha: Fix mixed up args in EXC macro in futex operations
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). Cc: stable@vger.kernel.org # v4.12+ Signed-off-by: Michael Cree <mcree@orcon.net.nz> Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch/alpha/include/asm')
-rw-r--r--arch/alpha/include/asm/futex.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/alpha/include/asm/futex.h b/arch/alpha/include/asm/futex.h
index d2e4da93e68c..ca3322536f72 100644
--- a/arch/alpha/include/asm/futex.h
+++ b/arch/alpha/include/asm/futex.h
@@ -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");