diff options
| author | Russell King | 2010-01-12 19:59:16 +0100 |
|---|---|---|
| committer | Russell King | 2010-01-12 19:59:16 +0100 |
| commit | 7511bce4069de39ea04b14c1e1d55c249f9ce808 (patch) | |
| tree | befa78be1f9631b9fc3d5cbc10cef9e8fcd641bd /arch/arm/kernel/entry-armv.S | |
| parent | ARM: 5874/1: serial21285: fix disable_irq-from-interrupt-handler deadlock (diff) | |
| download | kernel-qcow2-linux-7511bce4069de39ea04b14c1e1d55c249f9ce808.tar.gz kernel-qcow2-linux-7511bce4069de39ea04b14c1e1d55c249f9ce808.tar.xz kernel-qcow2-linux-7511bce4069de39ea04b14c1e1d55c249f9ce808.zip | |
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')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 4 |
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: #else -#ifdef CONFIG_SMP - mcr p15, 0, r0, c7, c10, 5 @ dmb -#endif + smp_dmb 1: ldrex r3, [r2] subs r3, r3, r0 strexeq r3, r1, [r2] |