diff options
author | Jean Delvare <khali@linux-fr.org> | 2008-05-01 07:35:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 11:04:01 -0400 |
commit | ef3fb66ced1a890769d71a4f4ae9f68b8afa98b6 (patch) | |
tree | d32a738c199cde6d2fe7837501f75d9d762d0919 /include | |
parent | 99da9047e675a4a8d671bbd67b34eb096c308b0d (diff) |
dmi: clean-up dmi helper declarations
The declaration of dmi helper functions is a bit messy and inconsistent at the
moment:
* On ia64 they are declared in <asm/io.h>.
* On x86-64 they are declared in <asm/dmi.h>.
* On i386 they are declared both in <asm/io.h> and <asm/dmi.h>.
Fix the header files so that the dmi helper functions are consistently
defined in <asm/dmi.h>.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Matt Domsch <Matt_Domsch@dell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-ia64/dmi.h | 5 | ||||
-rw-r--r-- | include/asm-ia64/io.h | 5 | ||||
-rw-r--r-- | include/asm-x86/dmi.h | 1 | ||||
-rw-r--r-- | include/asm-x86/io_32.h | 5 |
4 files changed, 6 insertions, 10 deletions
diff --git a/include/asm-ia64/dmi.h b/include/asm-ia64/dmi.h index f3efaa229525..00eb1b130b63 100644 --- a/include/asm-ia64/dmi.h +++ b/include/asm-ia64/dmi.h | |||
@@ -3,4 +3,9 @@ | |||
3 | 3 | ||
4 | #include <asm/io.h> | 4 | #include <asm/io.h> |
5 | 5 | ||
6 | /* Use normal IO mappings for DMI */ | ||
7 | #define dmi_ioremap ioremap | ||
8 | #define dmi_iounmap(x,l) iounmap(x) | ||
9 | #define dmi_alloc(l) kmalloc(l, GFP_ATOMIC) | ||
10 | |||
6 | #endif | 11 | #endif |
diff --git a/include/asm-ia64/io.h b/include/asm-ia64/io.h index 4ebed77aa472..260a85ac9d6a 100644 --- a/include/asm-ia64/io.h +++ b/include/asm-ia64/io.h | |||
@@ -423,11 +423,6 @@ extern void __iomem * ioremap(unsigned long offset, unsigned long size); | |||
423 | extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size); | 423 | extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size); |
424 | extern void iounmap (volatile void __iomem *addr); | 424 | extern void iounmap (volatile void __iomem *addr); |
425 | 425 | ||
426 | /* Use normal IO mappings for DMI */ | ||
427 | #define dmi_ioremap ioremap | ||
428 | #define dmi_iounmap(x,l) iounmap(x) | ||
429 | #define dmi_alloc(l) kmalloc(l, GFP_ATOMIC) | ||
430 | |||
431 | /* | 426 | /* |
432 | * String version of IO memory access ops: | 427 | * String version of IO memory access ops: |
433 | */ | 428 | */ |
diff --git a/include/asm-x86/dmi.h b/include/asm-x86/dmi.h index 1241e6ad1935..4edf7514a750 100644 --- a/include/asm-x86/dmi.h +++ b/include/asm-x86/dmi.h | |||
@@ -27,6 +27,7 @@ static inline void *dmi_alloc(unsigned len) | |||
27 | 27 | ||
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | /* Use early IO mappings for DMI because it's initialized early */ | ||
30 | #define dmi_ioremap early_ioremap | 31 | #define dmi_ioremap early_ioremap |
31 | #define dmi_iounmap early_iounmap | 32 | #define dmi_iounmap early_iounmap |
32 | 33 | ||
diff --git a/include/asm-x86/io_32.h b/include/asm-x86/io_32.h index 6e73467a4fb1..049e81e797a0 100644 --- a/include/asm-x86/io_32.h +++ b/include/asm-x86/io_32.h | |||
@@ -133,11 +133,6 @@ extern void *early_ioremap(unsigned long offset, unsigned long size); | |||
133 | extern void early_iounmap(void *addr, unsigned long size); | 133 | extern void early_iounmap(void *addr, unsigned long size); |
134 | extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); | 134 | extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); |
135 | 135 | ||
136 | /* Use early IO mappings for DMI because it's initialized early */ | ||
137 | #define dmi_ioremap early_ioremap | ||
138 | #define dmi_iounmap early_iounmap | ||
139 | #define dmi_alloc alloc_bootmem | ||
140 | |||
141 | /* | 136 | /* |
142 | * ISA I/O bus memory addresses are 1:1 with the physical address. | 137 | * ISA I/O bus memory addresses are 1:1 with the physical address. |
143 | */ | 138 | */ |