ia64: reuse asm-generic/barrier.h

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

diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
index df896a1..2f93348 100644 (file)
--- a/arch/ia64/include/asm/barrier.h
+++ b/arch/ia64/include/asm/barrier.h
@@ -48,12 +48,6 @@
 # define smp_mb()      barrier()
 #endif
 
-#define smp_rmb()      smp_mb()
-#define smp_wmb()      smp_mb()
-
-#define read_barrier_depends()         do { } while (0)
-#define smp_read_barrier_depends()     do { } while (0)
-
 #define smp_mb__before_atomic()        barrier()
 #define smp_mb__after_atomic() barrier()
 
@@ -77,12 +71,12 @@ do {                                                                        \
        ___p1;                                                          \
 })
 
-#define smp_store_mb(var, value)       do { WRITE_ONCE(var, value); mb(); } while (0)
-
 /*
  * The group barrier in front of the rsm & ssm are necessary to ensure
  * that none of the previous instructions in the same group are
  * affected by the rsm/ssm.
  */
 
+#include <asm-generic/barrier.h>
+
 #endif /* _ASM_IA64_BARRIER_H */