From 6d9b37a3a80195d317887ff81aad6a58a66954b5 Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 26 Jul 2005 19:44:26 +0100 Subject: [PATCH] ARM SMP: Add ARMv6 memory barriers Convert explicit gcc asm-based memory barriers into smp_mb() calls. These change between barrier() and the ARMv6 data memory barrier instruction depending on whether ARMv6 SMP is enabled. Signed-off-by: Russell King --- include/asm-arm/system.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/asm-arm/system.h') diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index 3f9c3626a73c..8efa4ebdcacb 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h @@ -139,7 +139,12 @@ extern unsigned int user_debug; #define vectors_high() (0) #endif +#if __LINUX_ARM_ARCH__ >= 6 +#define mb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" \ + : : "r" (0) : "memory") +#else #define mb() __asm__ __volatile__ ("" : : : "memory") +#endif #define rmb() mb() #define wmb() mb() #define read_barrier_depends() do { } while(0) -- cgit v1.2.3-59-g8ed1b