From ef3fb66ced1a890769d71a4f4ae9f68b8afa98b6 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 1 May 2008 04:35:01 -0700 Subject: 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 . * On x86-64 they are declared in . * On i386 they are declared both in and . Fix the header files so that the dmi helper functions are consistently defined in . Signed-off-by: Jean Delvare Cc: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/asm-x86/dmi.h | 1 + include/asm-x86/io_32.h | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'include/asm-x86') diff --git a/include/asm-x86/dmi.h b/include/asm-x86/dmi.h index 1241e6ad193..4edf7514a75 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 6e73467a4fb..049e81e797a 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. */ -- cgit v1.2.3