From 01f2fa7c320a163ce1fbb587767f02d018702d80 Mon Sep 17 00:00:00 2001
From: Brian Gerst <brgerst@gmail.com>
Date: Fri, 5 Feb 2010 09:37:04 -0500
Subject: [PATCH] --- yaml --- r: 182551 b: refs/heads/master c:
 bd2984e96452855d148ebce76f696dcecbc96340 h: refs/heads/master i:   182549:
 ca03fa77854a43dec77f47c6910a93b57e65b6d2   182547:
 75bc84623b738d6a1fc9efae1a39d202ccd6acdc   182543:
 041cff84552c3d3724957f6e0e9f11ca695b0098 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86/include/asm/io_32.h | 34 ++++--------------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/[refs] b/[refs]
index e02c802c4c4d..dd5ef8cbbecb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c64c7019e571a726f4aa9c1896402c15391a8ed
+refs/heads/master: bd2984e96452855d148ebce76f696dcecbc96340
diff --git a/trunk/arch/x86/include/asm/io_32.h b/trunk/arch/x86/include/asm/io_32.h
index e16b9dbef81a..72a6a4a930ae 100644
--- a/trunk/arch/x86/include/asm/io_32.h
+++ b/trunk/arch/x86/include/asm/io_32.h
@@ -120,47 +120,21 @@ static inline void slow_down_io(void)
 
 #endif
 
-#define __BUILDIO(bwl, bw, type)				\
-static inline void out##bwl(unsigned type value, int port)	\
-{								\
-	out##bwl##_local(value, port);				\
-}								\
-								\
-static inline unsigned type in##bwl(int port)			\
-{								\
-	return in##bwl##_local(port);				\
-}
-
 #define BUILDIO(bwl, bw, type)						\
-static inline void out##bwl##_local(unsigned type value, int port)	\
+static inline void out##bwl(unsigned type value, int port)		\
 {									\
-	asm volatile("out" #bwl " %" #bw "0, %w1"		\
+	asm volatile("out" #bwl " %" #bw "0, %w1"			\
 		     : : "a"(value), "Nd"(port));			\
 }									\
 									\
-static inline unsigned type in##bwl##_local(int port)			\
+static inline unsigned type in##bwl(int port)				\
 {									\
 	unsigned type value;						\
-	asm volatile("in" #bwl " %w1, %" #bw "0"		\
+	asm volatile("in" #bwl " %w1, %" #bw "0"			\
 		     : "=a"(value) : "Nd"(port));			\
 	return value;							\
 }									\
 									\
-static inline void out##bwl##_local_p(unsigned type value, int port)	\
-{									\
-	out##bwl##_local(value, port);					\
-	slow_down_io();							\
-}									\
-									\
-static inline unsigned type in##bwl##_local_p(int port)			\
-{									\
-	unsigned type value = in##bwl##_local(port);			\
-	slow_down_io();							\
-	return value;							\
-}									\
-									\
-__BUILDIO(bwl, bw, type)						\
-									\
 static inline void out##bwl##_p(unsigned type value, int port)		\
 {									\
 	out##bwl(value, port);						\