arm: define __smp_xxx

[cascardo/linux.git] / arch / arm / include / asm / barrier.h

diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
index 31152e8..112cc1a 100644 (file)
--- a/arch/arm/include/asm/barrier.h
+++ b/arch/arm/include/asm/barrier.h
@@ -60,15 +60,9 @@ extern void arm_heavy_mb(void);
 #define dma_wmb()      barrier()
 #endif
 
-#ifndef CONFIG_SMP
-#define smp_mb()       barrier()
-#define smp_rmb()      barrier()
-#define smp_wmb()      barrier()
-#else
-#define smp_mb()       dmb(ish)
-#define smp_rmb()      smp_mb()
-#define smp_wmb()      dmb(ishst)
-#endif
+#define __smp_mb()     dmb(ish)
+#define __smp_rmb()    __smp_mb()
+#define __smp_wmb()    dmb(ishst)
 
 #include <asm-generic/barrier.h>