From beacfaac3f23b30814aafee37a055257c7062ef3 Mon Sep 17 00:00:00 2001 From: "Huang, Ying" Date: Wed, 30 Jan 2008 13:33:44 +0100 Subject: x86 32-bit boot: rename bt_ioremap() to early_ioremap() This patch renames bt_ioremap to early_ioremap, which is used in x86_64. This makes it easier to merge i386 and x86_64 usage. [ mingo@elte.hu: fix ] Signed-off-by: Huang Ying Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- include/asm-x86/dmi.h | 7 ++----- include/asm-x86/efi.h | 8 -------- include/asm-x86/io_32.h | 16 ++++++++-------- 3 files changed, 10 insertions(+), 21 deletions(-) (limited to 'include') diff --git a/include/asm-x86/dmi.h b/include/asm-x86/dmi.h index 5008c365e6e..1241e6ad193 100644 --- a/include/asm-x86/dmi.h +++ b/include/asm-x86/dmi.h @@ -5,9 +5,6 @@ #ifdef CONFIG_X86_32 -/* Use early IO mappings for DMI because it's initialized early */ -#define dmi_ioremap bt_ioremap -#define dmi_iounmap bt_iounmap #define dmi_alloc alloc_bootmem #else /* CONFIG_X86_32 */ @@ -28,9 +25,9 @@ static inline void *dmi_alloc(unsigned len) return dmi_alloc_data + idx; } +#endif + #define dmi_ioremap early_ioremap #define dmi_iounmap early_iounmap #endif - -#endif diff --git a/include/asm-x86/efi.h b/include/asm-x86/efi.h index 10fcf20bdc7..8380131ca54 100644 --- a/include/asm-x86/efi.h +++ b/include/asm-x86/efi.h @@ -33,9 +33,6 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...); #define efi_call_virt6(f, a1, a2, a3, a4, a5, a6) \ efi_call_virt(f, a1, a2, a3, a4, a5, a6) -#define efi_early_ioremap(addr, size) bt_ioremap(addr, size) -#define efi_early_iounmap(vaddr, size) bt_iounmap(vaddr, size) - #define efi_ioremap(addr, size) ioremap(addr, size) #define end_pfn_map max_low_pfn @@ -91,13 +88,8 @@ extern u64 efi_call6(void *fp, u64 arg1, u64 arg2, u64 arg3, efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \ (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6)) -#define efi_early_ioremap(addr, size) early_ioremap(addr, size) -#define efi_early_iounmap(vaddr, size) early_iounmap(vaddr, size) - extern void *efi_ioremap(unsigned long offset, unsigned long size); -extern int efi_time; - #endif /* CONFIG_X86_32 */ extern void efi_reserve_bootmem(void); diff --git a/include/asm-x86/io_32.h b/include/asm-x86/io_32.h index f7b733d9ace..059a1fee4de 100644 --- a/include/asm-x86/io_32.h +++ b/include/asm-x86/io_32.h @@ -135,20 +135,20 @@ static inline void __iomem * ioremap(unsigned long offset, unsigned long size) extern void iounmap(volatile void __iomem *addr); /* - * bt_ioremap() and bt_iounmap() are for temporary early boot-time + * early_ioremap() and early_iounmap() are for temporary early boot-time * mappings, before the real ioremap() is functional. * A boot-time mapping is currently limited to at most 16 pages. */ -extern void bt_ioremap_init(void); -extern void bt_ioremap_clear(void); -extern void bt_ioremap_reset(void); -extern void *bt_ioremap(unsigned long offset, unsigned long size); -extern void bt_iounmap(void *addr, unsigned long size); +extern void early_ioremap_init(void); +extern void early_ioremap_clear(void); +extern void early_ioremap_reset(void); +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 bt_ioremap -#define dmi_iounmap bt_iounmap +#define dmi_ioremap early_ioremap +#define dmi_iounmap early_iounmap #define dmi_alloc alloc_bootmem /* -- cgit v1.2.3-70-g09d2