Skip to content

Commit

Permalink
ARM: 8582/1: remove unused CONFIG_ARCH_HAS_BARRIERS
Browse files Browse the repository at this point in the history
Since commit 2b749cb ("ARM: realview: remove private barrier
implementation"), this config is not used by any platform.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Masahiro Yamada authored and Russell King committed Jul 2, 2016
1 parent 215e362 commit 520319d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
4 changes: 1 addition & 3 deletions arch/arm/include/asm/barrier.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 0 additions & 6 deletions arch/arm/mm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 520319d

Please sign in to comment.