path: root/arch/arm/kernel/entry-armv.S
diff options
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-01-12 18:59:16 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-01-12 18:59:16 +0000
commit7511bce4069de39ea04b14c1e1d55c249f9ce808 (patch)
treebefa78be1f9631b9fc3d5cbc10cef9e8fcd641bd /arch/arm/kernel/entry-armv.S
parentcc20b900be7aa8e456aff82dfcb55fb15c508962 (diff)
ARM: Fix wrong dmb
The __kuser_cmpxchg code uses an ARMv6 dmb instruction, rather than one based upon the architecture being built for. Switch to using the macro provided for this purpose, which also eliminates the need for an ifdef. Acked-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index d2903e3bc861..6c5cf369183b 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -957,9 +957,7 @@ kuser_cmpxchg_fixup:
-#ifdef CONFIG_SMP
- mcr p15, 0, r0, c7, c10, 5 @ dmb
+ smp_dmb
1: ldrex r3, [r2]
subs r3, r3, r0
strexeq r3, r1, [r2]