From b4b990f4dd20d211397056f1ea551aee72e4bd6c Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Sat, 13 Oct 2007 03:06:55 +0200
Subject: [PATCH] --- yaml --- r: 68171 b: refs/heads/master c:
 4071c718555d955a35e9651f77086096ad87d498 h: refs/heads/master i:   68169:
 c07bb76504df9598dba6784e7e9dccebbdfa5db0   68167:
 32bab02a61691c155d15be8ffeffb87bc848fe6c v: v3

---
 [refs]                            |  2 +-
 trunk/include/asm-x86/system_32.h | 15 ++++++---------
 trunk/include/asm-x86/system_64.h |  6 +-----
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 684ae0aee280..1b10e4576e86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df1bdc0667eb3132fe60b3562347ca9133694ee0
+refs/heads/master: 4071c718555d955a35e9651f77086096ad87d498
diff --git a/trunk/include/asm-x86/system_32.h b/trunk/include/asm-x86/system_32.h
index d69ba937e092..8b15bd3057c9 100644
--- a/trunk/include/asm-x86/system_32.h
+++ b/trunk/include/asm-x86/system_32.h
@@ -216,6 +216,7 @@ static inline unsigned long get_limit(unsigned long segment)
 
 #define mb() alternative("lock; addl $0,0(%%esp)", "mfence", X86_FEATURE_XMM2)
 #define rmb() alternative("lock; addl $0,0(%%esp)", "lfence", X86_FEATURE_XMM2)
+#define wmb() alternative("lock; addl $0,0(%%esp)", "sfence", X86_FEATURE_XMM)
 
 /**
  * read_barrier_depends - Flush all pending reads that subsequents reads
@@ -271,18 +272,14 @@ static inline unsigned long get_limit(unsigned long segment)
 
 #define read_barrier_depends()	do { } while(0)
 
-#ifdef CONFIG_X86_OOSTORE
-/* Actually there are no OOO store capable CPUs for now that do SSE, 
-   but make it already an possibility. */
-#define wmb() alternative("lock; addl $0,0(%%esp)", "sfence", X86_FEATURE_XMM)
-#else
-#define wmb()	__asm__ __volatile__ ("": : :"memory")
-#endif
-
 #ifdef CONFIG_SMP
 #define smp_mb()	mb()
 #define smp_rmb()	rmb()
-#define smp_wmb()	wmb()
+#ifdef CONFIG_X86_OOSTORE
+# define smp_wmb() 	wmb()
+#else
+# define smp_wmb()	barrier()
+#endif
 #define smp_read_barrier_depends()	read_barrier_depends()
 #define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
 #else
diff --git a/trunk/include/asm-x86/system_64.h b/trunk/include/asm-x86/system_64.h
index 02175aa1d16a..eff730b11926 100644
--- a/trunk/include/asm-x86/system_64.h
+++ b/trunk/include/asm-x86/system_64.h
@@ -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)