Skip to content

Commit 520319d

Browse files
masahir0yRussell King
authored andcommitted
ARM: 8582/1: remove unused CONFIG_ARCH_HAS_BARRIERS
Since commit 2b749cb ("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]>
1 parent 215e362 commit 520319d

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

arch/arm/include/asm/barrier.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ extern void arm_heavy_mb(void);
4444
#define __arm_heavy_mb(x...) dsb(x)
4545
#endif
4646

47-
#ifdef CONFIG_ARCH_HAS_BARRIERS
48-
#include <mach/barriers.h>
49-
#elif defined(CONFIG_ARM_DMA_MEM_BUFFERABLE) || defined(CONFIG_SMP)
47+
#if defined(CONFIG_ARM_DMA_MEM_BUFFERABLE) || defined(CONFIG_SMP)
5048
#define mb() __arm_heavy_mb()
5149
#define rmb() dsb()
5250
#define wmb() __arm_heavy_mb(st)

arch/arm/mm/Kconfig

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,12 +1025,6 @@ config ARM_DMA_MEM_BUFFERABLE
10251025

10261026
You are recommended say 'Y' here and debug any affected drivers.
10271027

1028-
config ARCH_HAS_BARRIERS
1029-
bool
1030-
help
1031-
This option allows the use of custom mandatory barriers
1032-
included via the mach/barriers.h file.
1033-
10341028
config ARM_HEAVY_MB
10351029
bool
10361030

0 commit comments

Comments
 (0)