ARM: 8582/1: remove unused CONFIG_ARCH_HAS_BARRIERS

Since commit 2b749cb3a515 ("ARM: realview: remove private barrier
implementation"), this config is not used by any platform.

Signed-off-by: Masahiro Yamada <[email protected]>
Acked-by: Arnd Bergmann <[email protected]>
Signed-off-by: Russell King <[email protected]>

diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
index 112cc1a5d47f2ccac216d568e7ba30e2c0eaa8e0..f5d698182d5002179ecb4b5d2a81cc9dd0d23237 100644 (file)
--- a/arch/arm/include/asm/barrier.h
+++ b/arch/arm/include/asm/barrier.h
@@ -44,9 +44,7 @@ extern void arm_heavy_mb(void);
 #define __arm_heavy_mb(x...) dsb(x)
 #endif
 
-#ifdef CONFIG_ARCH_HAS_BARRIERS
-#include <mach/barriers.h>
-#elif defined(CONFIG_ARM_DMA_MEM_BUFFERABLE) || defined(CONFIG_SMP)
+#if defined(CONFIG_ARM_DMA_MEM_BUFFERABLE) || defined(CONFIG_SMP)
 #define mb()           __arm_heavy_mb()
 #define rmb()          dsb()
 #define wmb()          __arm_heavy_mb(st)

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index cb569b65a54ddcdaa8cce08d047799a24ba75f4b..d15a7fe51618ad70da5de7cf05408f882c6a4076 100644 (file)
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -1025,12 +1025,6 @@ config ARM_DMA_MEM_BUFFERABLE
 
          You are recommended say 'Y' here and debug any affected drivers.
 
-config ARCH_HAS_BARRIERS
-       bool
-       help
-         This option allows the use of custom mandatory barriers
-         included via the mach/barriers.h file.
-
 config ARM_HEAVY_MB
        bool