aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-m32r
diff options
context:
space:
mode:
authorHirokazu Takata <takata@linux-m32r.org>2006-02-20 18:28:15 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-20 20:00:12 -0800
commitb04ec261bd64f927bf3fce5cf9eeb0225557939d (patch)
tree2ad7a66b6f0dc6e0e641bef088865c5c140d0ae1 /include/asm-m32r
parent49d9c81a699b57a5b6488f3a761669d05e116588 (diff)
downloadkernel_samsung_smdk4412-b04ec261bd64f927bf3fce5cf9eeb0225557939d.zip
kernel_samsung_smdk4412-b04ec261bd64f927bf3fce5cf9eeb0225557939d.tar.gz
kernel_samsung_smdk4412-b04ec261bd64f927bf3fce5cf9eeb0225557939d.tar.bz2
[PATCH] m32r: __cmpxchg_u32 fix
This patch fixes a bug of include/asm-m32r/system.h:__cmpxchg_u32(). static __inline__ unsigned long __cmpxchg_u32(volatile unsigned int *p, unsigned int old, unsigned int new); In __cmpxchg_u32(), the "old" value must not be changed to the previous "*p" value. But the former code modifies the previous "*p" value. A deadlock at _atomic_dec_and_lock sometimes happened due to this bug. Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-m32r')
-rw-r--r--include/asm-m32r/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
index 06c12a0..d6a2c61 100644
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
@@ -239,7 +239,7 @@ __cmpxchg_u32(volatile unsigned int *p, unsigned int old, unsigned int new)
" bra 2f; \n"
" .fillinsn \n"
"1:"
- M32R_UNLOCK" %2, @%1; \n"
+ M32R_UNLOCK" %0, @%1; \n"
" .fillinsn \n"
"2:"
: "=&r" (retval)