summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/io_32.h
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2010-02-05 09:37:08 -0500
committerH. Peter Anvin <hpa@zytor.com>2010-02-05 13:57:38 -0800
commit910bf6ad0be3e1efbda0e9d358794937b52c9860 (patch)
treee488696b553210cf1655da2d5c8c7087fd6bd519 /arch/x86/include/asm/io_32.h
parent6175ddf06b6172046a329e3abfd9c901a43efd2e (diff)
downloadop-kernel-dev-910bf6ad0be3e1efbda0e9d358794937b52c9860.zip
op-kernel-dev-910bf6ad0be3e1efbda0e9d358794937b52c9860.tar.gz
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@gmail.com> LKML-Reference: <1265380629-3212-7-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/io_32.h')
-rw-r--r--arch/x86/include/asm/io_32.h10
1 files changed, 2 insertions, 8 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__ */
OpenPOWER on IntegriCloud