From 81b8fc3450ff61b1892aad9637277e99c18b056c Mon Sep 17 00:00:00 2001
From: Brian Gerst <brgerst@gmail.com>
Date: Fri, 5 Feb 2010 09:37:08 -0500
Subject: [PATCH] --- yaml --- r: 182555 b: refs/heads/master c:
 910bf6ad0be3e1efbda0e9d358794937b52c9860 h: refs/heads/master i:   182553:
 df24b52087212ce68c97f1e94c9828786b6781be   182551:
 01f2fa7c320a163ce1fbb587767f02d018702d80 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86/include/asm/io_32.h | 10 ++--------
 trunk/arch/x86/include/asm/io_64.h |  8 +++++++-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index a801df51c7f0..f53f52571192 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6175ddf06b6172046a329e3abfd9c901a43efd2e
+refs/heads/master: 910bf6ad0be3e1efbda0e9d358794937b52c9860
diff --git a/trunk/arch/x86/include/asm/io_32.h b/trunk/arch/x86/include/asm/io_32.h
index 685e33293468..e8177f3b87f6 100644
--- a/trunk/arch/x86/include/asm/io_32.h
+++ b/trunk/arch/x86/include/asm/io_32.h
@@ -84,18 +84,12 @@ memcpy_toio(volatile void __iomem *dst, const void *src, size_t count)
  *	2. Accidentally out of order processors (PPro errata #51)
  */
 
-#if defined(CONFIG_X86_OOSTORE) || defined(CONFIG_X86_PPRO_FENCE)
-
 static inline void flush_write_buffers(void)
 {
+#if defined(CONFIG_X86_OOSTORE) || defined(CONFIG_X86_PPRO_FENCE)
 	asm volatile("lock; addl $0,0(%%esp)": : :"memory");
-}
-
-#else
-
-#define flush_write_buffers() do { } while (0)
-
 #endif
+}
 
 #endif /* __KERNEL__ */
 
diff --git a/trunk/arch/x86/include/asm/io_64.h b/trunk/arch/x86/include/asm/io_64.h
index 1305525813fc..6964a1c366d3 100644
--- a/trunk/arch/x86/include/asm/io_64.h
+++ b/trunk/arch/x86/include/asm/io_64.h
@@ -83,7 +83,13 @@ memcpy_toio(volatile void __iomem *dst, const void *src, size_t count)
  *	1. Out of order aware processors
  *	2. Accidentally out of order processors (PPro errata #51)
  */
-#define flush_write_buffers() do { } while (0)
+
+static inline void flush_write_buffers(void)
+{
+#if defined(CONFIG_X86_OOSTORE) || defined(CONFIG_X86_PPRO_FENCE)
+	asm volatile("lock; addl $0,0(%%esp)": : :"memory");
+#endif
+}
 
 #endif /* __KERNEL__ */