Commit 1fba3870 authored by Andi Kleen's avatar Andi Kleen Committed by Ingo Molnar

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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c7e844f0
...@@ -275,29 +275,6 @@ static inline void slow_down_io(void) { ...@@ -275,29 +275,6 @@ static inline void slow_down_io(void) {
#endif #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) \ #define __BUILDIO(bwl,bw,type) \
static inline void out##bwl(unsigned type value, int port) { \ static inline void out##bwl(unsigned type value, int port) { \
out##bwl##_local(value, port); \ out##bwl##_local(value, port); \
...@@ -305,8 +282,6 @@ static inline void out##bwl(unsigned type value, int port) { \ ...@@ -305,8 +282,6 @@ static inline void out##bwl(unsigned type value, int port) { \
static inline unsigned type in##bwl(int port) { \ static inline unsigned type in##bwl(int port) { \
return in##bwl##_local(port); \ return in##bwl##_local(port); \
} }
#endif
#define BUILDIO(bwl,bw,type) \ #define BUILDIO(bwl,bw,type) \
static inline void out##bwl##_local(unsigned type value, int port) { \ static inline void out##bwl##_local(unsigned type value, int port) { \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment