Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

[~andy/linux] / arch / x86 / include / asm / efi.h

diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index fd13815fe85c9d9d45a6c79b7c93d9e68f9ebff0..28677c55113f8cea59e59c67e7cd53cfcd615b6d 100644 (file)
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -69,37 +69,23 @@ extern u64 efi_call6(void *fp, u64 arg1, u64 arg2, u64 arg3,
        efi_call6((void *)(f), (u64)(a1), (u64)(a2), (u64)(a3),         \
                  (u64)(a4), (u64)(a5), (u64)(a6))
 
-extern unsigned long efi_call_virt_prelog(void);
-extern void efi_call_virt_epilog(unsigned long);
-
-#define efi_callx(x, func, ...)                                        \
-       ({                                                      \
-               efi_status_t __status;                          \
-               unsigned long __pgd;                            \
-                                                               \
-               __pgd = efi_call_virt_prelog();                 \
-               __status = efi_call##x(func, __VA_ARGS__);      \
-               efi_call_virt_epilog(__pgd);                    \
-               __status;                                       \
-       })
-
 #define efi_call_virt0(f)                              \
-       efi_callx(0, (void *)(efi.systab->runtime->f))
+       efi_call0((void *)(efi.systab->runtime->f))
 #define efi_call_virt1(f, a1)                                  \
-       efi_callx(1, (void *)(efi.systab->runtime->f), (u64)(a1))
+       efi_call1((void *)(efi.systab->runtime->f), (u64)(a1))
 #define efi_call_virt2(f, a1, a2)                                      \
-       efi_callx(2, (void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2))
+       efi_call2((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2))
 #define efi_call_virt3(f, a1, a2, a3)                                  \
-       efi_callx(3, (void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
+       efi_call3((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
                  (u64)(a3))
 #define efi_call_virt4(f, a1, a2, a3, a4)                              \
-       efi_callx(4, (void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
+       efi_call4((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
                  (u64)(a3), (u64)(a4))
 #define efi_call_virt5(f, a1, a2, a3, a4, a5)                          \
-       efi_callx(5, (void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
+       efi_call5((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
                  (u64)(a3), (u64)(a4), (u64)(a5))
 #define efi_call_virt6(f, a1, a2, a3, a4, a5, a6)                      \
-       efi_callx(6, (void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
+       efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
                  (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6))
 
 extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,
@@ -108,6 +94,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,
 #endif /* CONFIG_X86_32 */
 
 extern int add_efi_memmap;
+extern unsigned long x86_efi_facility;
 extern void efi_set_executable(efi_memory_desc_t *md, bool executable);
 extern int efi_memblock_x86_reserve_range(void);
 extern void efi_call_phys_prelog(void);