Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / include / asm-x86 / efi.h

diff --git a/include/asm-x86/efi.h b/include/asm-x86/efi.h
index 10fcf20bdc73375501bc2b0c7f146de3369f9a84..d53004b855cce82b6303cbe8adde1bf47d450977 100644 (file)
--- a/include/asm-x86/efi.h
+++ b/include/asm-x86/efi.h
@@ -20,7 +20,7 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...);
  */
 
 #define efi_call_virt(f, args...) \
-     ((efi_##f##_t __attribute__((regparm(0)))*)efi.systab->runtime->f)(args)
+       ((efi_##f##_t __attribute__((regparm(0)))*)efi.systab->runtime->f)(args)
 
 #define efi_call_virt0(f)              efi_call_virt(f)
 #define efi_call_virt1(f, a1)          efi_call_virt(f, a1)
@@ -33,12 +33,7 @@ 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
+#define efi_ioremap(addr, size)                        ioremap_cache(addr, size)
 
 #else /* !CONFIG_X86_32 */
 
@@ -91,18 +86,12 @@ 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;
+extern void *efi_ioremap(unsigned long addr, unsigned long size);
 
 #endif /* CONFIG_X86_32 */
 
 extern void efi_reserve_bootmem(void);
 extern void efi_call_phys_prelog(void);
 extern void efi_call_phys_epilog(void);
-extern void runtime_code_page_mkexec(void);
 
 #endif