summaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/cmpxchg-grb.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-09 08:17:32 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-09 08:17:32 +0100
commitce67eef6a112bb283c6db39f9195800f31f5599a (patch)
tree34f2e7fbd0b9838abba482dbb1a7db09e6fbb53c /arch/sh/include/asm/cmpxchg-grb.h
parentInput: wacom - merge out and in prox events (diff)
parentLinux 2.6.34-rc1 (diff)
downloadlinux-ce67eef6a112bb283c6db39f9195800f31f5599a.tar.xz
linux-ce67eef6a112bb283c6db39f9195800f31f5599a.zip
Merge commit 'v2.6.34-rc1' into for-linus
Diffstat (limited to 'arch/sh/include/asm/cmpxchg-grb.h')
-rw-r--r--arch/sh/include/asm/cmpxchg-grb.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/sh/include/asm/cmpxchg-grb.h b/arch/sh/include/asm/cmpxchg-grb.h
index e2681abe764f..4676bf57693a 100644
--- a/arch/sh/include/asm/cmpxchg-grb.h
+++ b/arch/sh/include/asm/cmpxchg-grb.h
@@ -57,11 +57,10 @@ static inline unsigned long __cmpxchg_u32(volatile int *m, unsigned long old,
" mov.l @%1, %0 \n\t" /* load old value */
" cmp/eq %0, %2 \n\t"
" bf 1f \n\t" /* if not equal */
- " mov.l %2, @%1 \n\t" /* store new value */
+ " mov.l %3, @%1 \n\t" /* store new value */
"1: mov r1, r15 \n\t" /* LOGOUT */
- : "=&r" (retval),
- "+r" (m)
- : "r" (new)
+ : "=&r" (retval)
+ : "r" (m), "r" (old), "r" (new)
: "memory" , "r0", "r1", "t");
return retval;