aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/efi.h
diff options
context:
space:
mode:
authorHuang, Ying <ying.huang@intel.com>2008-01-30 07:33:44 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:44 -0500
commitbeacfaac3f23b30814aafee37a055257c7062ef3 (patch)
tree9a9a25cafa5fa4b79026caa8b0b442dc54b78889 /include/asm-x86/efi.h
parent4716e79c9946044a53a65418cfba04836f6a5c36 (diff)
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 <ying.huang@intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/efi.h')
-rw-r--r--include/asm-x86/efi.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-x86/efi.h b/include/asm-x86/efi.h
index 10fcf20bdc73..8380131ca542 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 *, ...);
33#define efi_call_virt6(f, a1, a2, a3, a4, a5, a6) \ 33#define efi_call_virt6(f, a1, a2, a3, a4, a5, a6) \
34 efi_call_virt(f, a1, a2, a3, a4, a5, a6) 34 efi_call_virt(f, a1, a2, a3, a4, a5, a6)
35 35
36#define efi_early_ioremap(addr, size) bt_ioremap(addr, size)
37#define efi_early_iounmap(vaddr, size) bt_iounmap(vaddr, size)
38
39#define efi_ioremap(addr, size) ioremap(addr, size) 36#define efi_ioremap(addr, size) ioremap(addr, size)
40 37
41#define end_pfn_map max_low_pfn 38#define end_pfn_map max_low_pfn
@@ -91,13 +88,8 @@ extern u64 efi_call6(void *fp, u64 arg1, u64 arg2, u64 arg3,
91 efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \ 88 efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
92 (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6)) 89 (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6))
93 90
94#define efi_early_ioremap(addr, size) early_ioremap(addr, size)
95#define efi_early_iounmap(vaddr, size) early_iounmap(vaddr, size)
96
97extern void *efi_ioremap(unsigned long offset, unsigned long size); 91extern void *efi_ioremap(unsigned long offset, unsigned long size);
98 92
99extern int efi_time;
100
101#endif /* CONFIG_X86_32 */ 93#endif /* CONFIG_X86_32 */
102 94
103extern void efi_reserve_bootmem(void); 95extern void efi_reserve_bootmem(void);