Commit-ID: 910bf6ad0be3e1efbda0e9d358794937b52c9860
Gitweb: http://git.kernel.org/tip/910bf6ad0be3e1efbda0e9d358794937b52c9860
Author: Brian Gerst <brgerst@xxxxxxxxx>
AuthorDate: Fri, 5 Feb 2010 09:37:08 -0500
Committer: H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Fri, 5 Feb 2010 13:57:38 -0800
x86: Simplify flush_write_buffers()
Always make it an inline instead of using a macro for the no-op case.
Signed-off-by: Brian Gerst <brgerst@xxxxxxxxx>
LKML-Reference: <1265380629-3212-7-git-send-email-brgerst@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
---
arch/x86/include/asm/io_32.h | 10 ++--------
arch/x86/include/asm/io_64.h | 8 +++++++-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/x86/include/asm/io_32.h b/arch/x86/include/asm/io_32.h
index 685e332..e8177f3 100644
--- a/arch/x86/include/asm/io_32.h
+++ b/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/arch/x86/include/asm/io_64.h b/arch/x86/include/asm/io_64.h
index 1305525..6964a1c 100644
--- a/arch/x86/include/asm/io_64.h
+++ b/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__ */
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|