1 files changed, 3 insertions, 7 deletions

diff --git a/include/asm-x86/system_64.h b/include/asm-x86/system_64.h
index 02175aa1d16a..5022aecc333d 100644
--- a/include/asm-x86/system_64.h
+++ b/include/asm-x86/system_64.h
@@ -141,8 +141,8 @@ static inline void write_cr8(unsigned long val)
 
 #ifdef CONFIG_SMP
 #define smp_mb()        mb()
-#define smp_rmb()       rmb()
-#define smp_wmb()       wmb()
+#define smp_rmb()       barrier()
+#define smp_wmb()       barrier()
 #define smp_read_barrier_depends()      do {} while(0)
 #else
 #define smp_mb()        barrier()
@@ -159,12 +159,8 @@ static inline void write_cr8(unsigned long val)
  */
 #define mb()    asm volatile("mfence":::"memory")
 #define rmb()   asm volatile("lfence":::"memory")
-
-#ifdef CONFIG_UNORDERED_IO
 #define wmb()   asm volatile("sfence" ::: "memory")
-#else
-#define wmb()   asm volatile("" ::: "memory")
-#endif
+
 #define read_barrier_depends()  do {} while(0)
 #define set_mb(var, value) do { (void) xchg(&var, value); } while (0)