Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[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 c6a3e73..d2f81e6 100644 (file)
--- a/arch/arm/include/asm/barrier.h
+++ b/arch/arm/include/asm/barrier.h
@@ -43,10 +43,14 @@
 #define mb()           do { dsb(); outer_sync(); } while (0)
 #define rmb()          dsb()
 #define wmb()          do { dsb(st); outer_sync(); } while (0)
+#define dma_rmb()      dmb(osh)
+#define dma_wmb()      dmb(oshst)
 #else
 #define mb()           barrier()
 #define rmb()          barrier()
 #define wmb()          barrier()
+#define dma_rmb()      barrier()
+#define dma_wmb()      barrier()
 #endif
 
 #ifndef CONFIG_SMP