UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 ca282f6973 (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>
This commit is contained in:
Michael Cree 2017-11-24 21:25:01 +13:00 committed by Matt Turner
parent d437e0659f
commit 84e455361e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/alpha/include/asm/futex.h
View File

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