aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2008-02-04 16:48:03 +0100
committerIngo Molnar <mingo@elte.hu>2008-02-04 16:48:03 +0100
commit1fba38703d0ce8a5ff0fad9df3eccc6b55cf2cfb (patch)
tree8a64e30f37d5a5ff84ce462d0f20ae518c6e299d /include/asm-x86
parentc7e844f0415252c7e1a2153a97e7a0c511d61ada (diff)
downloadkernel_samsung_aries-1fba38703d0ce8a5ff0fad9df3eccc6b55cf2cfb.zip
kernel_samsung_aries-1fba38703d0ce8a5ff0fad9df3eccc6b55cf2cfb.tar.gz
kernel_samsung_aries-1fba38703d0ce8a5ff0fad9df3eccc6b55cf2cfb.tar.bz2
x86: remove special NUMAQ support in io_32.h
Now that the only user does it on its own remove the NUMAQ support macros in io_32.h The next step would be to convert the preprocessor mess to actually readable standard inlines. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/io_32.h25
1 files changed, 0 insertions, 25 deletions
diff --git a/include/asm-x86/io_32.h b/include/asm-x86/io_32.h
index 586d7aa..58d2c45 100644
--- a/include/asm-x86/io_32.h
+++ b/include/asm-x86/io_32.h
@@ -275,29 +275,6 @@ static inline void slow_down_io(void) {
#endif
-#ifdef CONFIG_X86_NUMAQ
-extern void *xquad_portio; /* Where the IO area was mapped */
-#define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)
-#define __BUILDIO(bwl,bw,type) \
-static inline void out##bwl##_quad(unsigned type value, int port, int quad) { \
- if (xquad_portio) \
- write##bwl(value, XQUAD_PORT_ADDR(port, quad)); \
- else \
- out##bwl##_local(value, port); \
-} \
-static inline void out##bwl(unsigned type value, int port) { \
- out##bwl##_quad(value, port, 0); \
-} \
-static inline unsigned type in##bwl##_quad(int port, int quad) { \
- if (xquad_portio) \
- return read##bwl(XQUAD_PORT_ADDR(port, quad)); \
- else \
- return in##bwl##_local(port); \
-} \
-static inline unsigned type in##bwl(int port) { \
- return in##bwl##_quad(port, 0); \
-}
-#else
#define __BUILDIO(bwl,bw,type) \
static inline void out##bwl(unsigned type value, int port) { \
out##bwl##_local(value, port); \
@@ -305,8 +282,6 @@ static inline void out##bwl(unsigned type value, int port) { \
static inline unsigned type in##bwl(int port) { \
return in##bwl##_local(port); \
}
-#endif
-
#define BUILDIO(bwl,bw,type) \
static inline void out##bwl##_local(unsigned type value, int port) { \