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

Commit 84e45536 authored by Michael Cree's avatar Michael Cree Committed by Matt Turner
Browse files

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 ca282f69 (alpha: add a
helper for emitting exception table entries).

Cc: stable@vger.kernel.org      # v4.12+
Signed-off-by: default avatarMichael Cree <mcree@orcon.net.nz>
Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
parent d437e065

arch/alpha/include/asm/futex.h

+4 −4
Original line number Diff line number Diff line
@@ -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");