summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/barrier.h
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-08-21 12:26:24 +0200
committerMarek Szyprowski <m.szyprowski@samsung.com>2012-10-02 08:58:07 +0200
commit48aa820f1e3824e46dde6251db98e5961abf605d (patch)
tree20cac9fd267b7e8bc43e47165c631bb6cadef15b /arch/arm/include/asm/barrier.h
parent0fa478df444f5837336d7e2fd0b41643c8d704c2 (diff)
downloadlinux-48aa820f1e3824e46dde6251db98e5961abf605d.tar.bz2
ARM: kill off arch_is_coherent
With ixp2xxx removed, there are no platforms that define arch_is_coherent, so the last occurrences of arch_is_coherent can be removed. Any new platform with coherent i/o should use coherent dma mapping functions. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'arch/arm/include/asm/barrier.h')
-rw-r--r--arch/arm/include/asm/barrier.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
index 05112380dc53..8dcd9c702d90 100644
--- a/arch/arm/include/asm/barrier.h
+++ b/arch/arm/include/asm/barrier.h
@@ -44,10 +44,9 @@
#define rmb() dsb()
#define wmb() mb()
#else
-#include <asm/memory.h>
-#define mb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)
-#define rmb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)
-#define wmb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)
+#define mb() barrier()
+#define rmb() barrier()
+#define wmb() barrier()
#endif
#ifndef CONFIG_SMP