diff options
| author | Jean Delvare <khali@linux-fr.org> | 2008-05-01 04:35:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 08:04:01 -0700 |
| commit | ef3fb66ced1a890769d71a4f4ae9f68b8afa98b6 (patch) | |
| tree | d32a738c199cde6d2fe7837501f75d9d762d0919 /include/asm-x86 | |
| parent | 99da9047e675a4a8d671bbd67b34eb096c308b0d (diff) | |
| download | op-kernel-dev-ef3fb66ced1a890769d71a4f4ae9f68b8afa98b6.zip op-kernel-dev-ef3fb66ced1a890769d71a4f4ae9f68b8afa98b6.tar.gz | |
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/asm-x86')
| -rw-r--r-- | include/asm-x86/dmi.h | 1 | ||||
| -rw-r--r-- | include/asm-x86/io_32.h | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-x86/dmi.h b/include/asm-x86/dmi.h index 1241e6a..4edf751 100644 --- a/include/asm-x86/dmi.h +++ b/include/asm-x86/dmi.h @@ -27,6 +27,7 @@ static inline void *dmi_alloc(unsigned len) #endif +/* Use early IO mappings for DMI because it's initialized early */ #define dmi_ioremap early_ioremap #define dmi_iounmap early_iounmap diff --git a/include/asm-x86/io_32.h b/include/asm-x86/io_32.h index 6e73467..049e81e 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); extern void early_iounmap(void *addr, unsigned long size); extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); -/* Use early IO mappings for DMI because it's initialized early */ -#define dmi_ioremap early_ioremap -#define dmi_iounmap early_iounmap -#define dmi_alloc alloc_bootmem - /* * ISA I/O bus memory addresses are 1:1 with the physical address. */ |
