[PATCH] x86_64: change dm_ioremap to ioremap

From: Yinghai Lu
Date: Tue Jun 05 2007 - 02:21:34 EST


[PATCH] x86_64: change dmi_ioremap to ioremap

dmi_scan_machine==>dmi_present==>dmi_table==>dmi_ioremap uses
early_ioremap in mm/init.c
dmi_scan_machine is called after init_memory_mappings, and could use
ioremap instead.
also remove extra extern declaring about dmi_ioremap

Signed-off-by: Yinghai Lu <yinghai.lu@xxxxxxx>
diff --git a/include/asm-x86_64/dmi.h b/include/asm-x86_64/dmi.h
index 93b2b15..fc7b576 100644
--- a/include/asm-x86_64/dmi.h
+++ b/include/asm-x86_64/dmi.h
@@ -3,15 +3,12 @@

#include <asm/io.h>

-extern void *dmi_ioremap(unsigned long addr, unsigned long size);
-extern void dmi_iounmap(void *addr, unsigned long size);
-
#define DMI_MAX_DATA 2048

extern int dmi_alloc_index;
extern char dmi_alloc_data[DMI_MAX_DATA];

-/* This is so early that there is no good way to allocate dynamic memory.
+/* This is so early that there is no good way to allocate dynamic memory.
Allocate data in an BSS array. */
static inline void *dmi_alloc(unsigned len)
{
@@ -21,7 +18,7 @@ static inline void *dmi_alloc(unsigned len)
return dmi_alloc_data + idx;
}

-#define dmi_ioremap early_ioremap
-#define dmi_iounmap early_iounmap
+#define dmi_ioremap ioremap
+#define dmi_iounmap(x,l) iounmap(x)

#endif