diff options
| author | Huang, Ying <ying.huang@intel.com> | 2008-01-30 13:33:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:44 +0100 |
| commit | beacfaac3f23b30814aafee37a055257c7062ef3 (patch) | |
| tree | 9a9a25cafa5fa4b79026caa8b0b442dc54b78889 /include/asm-x86/efi.h | |
| parent | x86: replace boot_ioremap() with enhanced bt_ioremap() - remove boot_ioremap() (diff) | |
| download | linux-beacfaac3f23b30814aafee37a055257c7062ef3.tar.xz linux-beacfaac3f23b30814aafee37a055257c7062ef3.zip | |
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.h | 8 |
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 *, ...); #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); |