From 9f61939ffda6a05b4d3a615fdb0cec3ad88f3f74 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sat, 25 Mar 2006 16:31:31 +0100
Subject: [PATCH] --- yaml --- r: 23838 b: refs/heads/master c:
 ba22f13563de5773701fc318ccaaa37b1fb6d294 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/arch/x86_64/Kconfig     | 10 ----------
 trunk/include/asm-x86_64/io.h | 18 ------------------
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index 2f9832c5b76c..63f37b733679 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d95dd849ccc43c4b21504e1829b5bed68cdb1bc
+refs/heads/master: ba22f13563de5773701fc318ccaaa37b1fb6d294
diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig
index 6fc631457196..31bab721cb71 100644
--- a/trunk/arch/x86_64/Kconfig
+++ b/trunk/arch/x86_64/Kconfig
@@ -520,16 +520,6 @@ config PCI_MMCONFIG
 	bool "Support mmconfig PCI config space access"
 	depends on PCI && ACPI
 
-config UNORDERED_IO
-       bool "Unordered IO mapping access"
-       depends on EXPERIMENTAL
-       help
-         Use unordered stores to access IO memory mappings in device drivers.
-	 Still very experimental. When a driver works on IA64/ppc64/pa-risc it should
-	 work with this option, but it makes the drivers behave differently
-	 from i386. Requires that the driver writer used memory barriers
-	 properly.
-
 source "drivers/pci/pcie/Kconfig"
 
 source "drivers/pci/Kconfig"
diff --git a/trunk/include/asm-x86_64/io.h b/trunk/include/asm-x86_64/io.h
index ac12bda3bb1f..cafdfb37f0d8 100644
--- a/trunk/include/asm-x86_64/io.h
+++ b/trunk/include/asm-x86_64/io.h
@@ -200,23 +200,6 @@ static inline __u64 __readq(const volatile void __iomem *addr)
 
 #define mmiowb()
 
-#ifdef CONFIG_UNORDERED_IO
-static inline void __writel(__u32 val, volatile void __iomem *addr)
-{
-	volatile __u32 __iomem *target = addr;
-	asm volatile("movnti %1,%0"
-		     : "=m" (*target)
-		     : "r" (val) : "memory");
-}
-
-static inline void __writeq(__u64 val, volatile void __iomem *addr)
-{
-	volatile __u64 __iomem *target = addr;
-	asm volatile("movnti %1,%0"
-		     : "=m" (*target)
-		     : "r" (val) : "memory");
-}
-#else
 static inline void __writel(__u32 b, volatile void __iomem *addr)
 {
 	*(__force volatile __u32 *)addr = b;
@@ -225,7 +208,6 @@ static inline void __writeq(__u64 b, volatile void __iomem *addr)
 {
 	*(__force volatile __u64 *)addr = b;
 }
-#endif
 static inline void __writeb(__u8 b, volatile void __iomem *addr)
 {
 	*(__force volatile __u8 *)addr = b;