aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2009-01-28 18:42:23 -0500
committerH. Peter Anvin <hpa@zytor.com>2009-01-29 01:34:17 -0500
commita448720ca3248e8a7a426336885549d6e923fd8e (patch)
tree5952687d06c605434ea6d753c4753c142f5e174c /arch/x86/include/asm
parent8f6d86dc4178957d9814b1784848012a927a3898 (diff)
x86: unify asm/io.h: IO_SPACE_LIMIT
Impact: Cleanup (trivial unification) Move common define IO_SPACE_LIMIT from <asm/io_*.h> to <asm/io.h>. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/io.h1
-rw-r--r--arch/x86/include/asm/io_32.h2
-rw-r--r--arch/x86/include/asm/io_64.h2
3 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 05cfed4485fa..975207c08b3e 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -106,5 +106,6 @@ extern void __iomem *early_memremap(unsigned long offset, unsigned long size);
106extern void early_iounmap(void __iomem *addr, unsigned long size); 106extern void early_iounmap(void __iomem *addr, unsigned long size);
107extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); 107extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
108 108
109#define IO_SPACE_LIMIT 0xffff
109 110
110#endif /* _ASM_X86_IO_H */ 111#endif /* _ASM_X86_IO_H */
diff --git a/arch/x86/include/asm/io_32.h b/arch/x86/include/asm/io_32.h
index d8e242e1b396..e08d8ed05a1f 100644
--- a/arch/x86/include/asm/io_32.h
+++ b/arch/x86/include/asm/io_32.h
@@ -37,8 +37,6 @@
37 * - Arnaldo Carvalho de Melo <acme@conectiva.com.br> 37 * - Arnaldo Carvalho de Melo <acme@conectiva.com.br>
38 */ 38 */
39 39
40#define IO_SPACE_LIMIT 0xffff
41
42#define XQUAD_PORTIO_BASE 0xfe400000 40#define XQUAD_PORTIO_BASE 0xfe400000
43#define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */ 41#define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
44 42
diff --git a/arch/x86/include/asm/io_64.h b/arch/x86/include/asm/io_64.h
index 563c16270ba6..1131d8ea2c61 100644
--- a/arch/x86/include/asm/io_64.h
+++ b/arch/x86/include/asm/io_64.h
@@ -136,8 +136,6 @@ __OUTS(b)
136__OUTS(w) 136__OUTS(w)
137__OUTS(l) 137__OUTS(l)
138 138
139#define IO_SPACE_LIMIT 0xffff
140
141#if defined(__KERNEL__) && defined(__x86_64__) 139#if defined(__KERNEL__) && defined(__x86_64__)
142 140
143#include <linux/vmalloc.h> 141#include <linux/vmalloc.h>