Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix futex_atomic_cmpxchg_inatomic implementation.
+8
-10
include/asm-sparc64/futex.h
+8
-10
include/asm-sparc64/futex.h
···
87
87
futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
88
88
{
89
89
__asm__ __volatile__(
90
-
"\n1: lduwa [%2] %%asi, %0\n"
91
-
"2: casa [%2] %%asi, %0, %1\n"
92
-
"3:\n"
90
+
"\n1: casa [%3] %%asi, %2, %0\n"
91
+
"2:\n"
93
92
" .section .fixup,#alloc,#execinstr\n"
94
93
" .align 4\n"
95
-
"4: ba 3b\n"
96
-
" mov %3, %0\n"
94
+
"3: ba 2b\n"
95
+
" mov %4, %0\n"
97
96
" .previous\n"
98
97
" .section __ex_table,\"a\"\n"
99
98
" .align 4\n"
100
-
" .word 1b, 4b\n"
101
-
" .word 2b, 4b\n"
99
+
" .word 1b, 3b\n"
102
100
" .previous\n"
103
-
: "=&r" (oldval)
104
-
: "r" (newval), "r" (uaddr), "i" (-EFAULT)
101
+
: "=r" (newval)
102
+
: "0" (newval), "r" (oldval), "r" (uaddr), "i" (-EFAULT)
105
103
: "memory");
106
104
107
-
return oldval;
105
+
return newval;
108
106
}
109
107
110
108
#endif /* !(_SPARC64_FUTEX_H) */