s390: define __smp_xxx

[cascardo/linux.git] / arch / s390 / include / asm / barrier.h

diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
index d68e11e..fbd25b2 100644 (file)
--- a/arch/s390/include/asm/barrier.h
+++ b/arch/s390/include/asm/barrier.h
@@ -26,26 +26,21 @@
 #define wmb()                          barrier()
 #define dma_rmb()                      mb()
 #define dma_wmb()                      mb()
-#define smp_mb()                       mb()
-#define smp_rmb()                      rmb()
-#define smp_wmb()                      wmb()
-
-#define read_barrier_depends()         do { } while (0)
-#define smp_read_barrier_depends()     do { } while (0)
-
-#define smp_mb__before_atomic()                smp_mb()
-#define smp_mb__after_atomic()         smp_mb()
-
-#define smp_store_mb(var, value)               do { WRITE_ONCE(var, value); mb(); } while (0)
-
-#define smp_store_release(p, v)                                                \
+#define __smp_mb()                     mb()
+#define __smp_rmb()                    rmb()
+#define __smp_wmb()                    wmb()
+#define smp_mb()                       __smp_mb()
+#define smp_rmb()                      __smp_rmb()
+#define smp_wmb()                      __smp_wmb()
+
+#define __smp_store_release(p, v)                                      \
 do {                                                                   \
        compiletime_assert_atomic_type(*p);                             \
        barrier();                                                      \
        WRITE_ONCE(*p, v);                                              \
 } while (0)
 
-#define smp_load_acquire(p)                                            \
+#define __smp_load_acquire(p)                                          \
 ({                                                                     \
        typeof(*p) ___p1 = READ_ONCE(*p);                               \
        compiletime_assert_atomic_type(*p);                             \
@@ -53,4 +48,6 @@ do {                                                                  \
        ___p1;                                                          \
 })
 
+#include <asm-generic/barrier.h>
+
 #endif /* __ASM_BARRIER_H */