diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 15:15:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 15:20:41 -0800 |
| commit | 11520e5e7c1855fc3bf202bb3be35a39d9efa034 (patch) | |
| tree | 734ea170f825000dceef3f724dff474b46fce11d /arch/x86/include/asm/efi.h | |
| parent | 5bd665f28db2b04a8d6fe277342479906fc60b62 (diff) | |
Revert "x86-64/efi: Use EFI to deal with platform wall clock (again)"
This reverts commit bd52276fa1d4 ("x86-64/efi: Use EFI to deal with
platform wall clock (again)"), and the two supporting commits:
da5a108d05b4: "x86/kernel: remove tboot 1:1 page table creation code"
185034e72d59: "x86, efi: 1:1 pagetable mapping for virtual EFI calls")
as they all depend semantically on commit 53b87cf088e2 ("x86, mm:
Include the entire kernel memory map in trampoline_pgd") that got
reverted earlier due to the problems it caused.
This was pointed out by Yinghai Lu, and verified by me on my Macbook Air
that uses EFI.
Pointed-out-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/include/asm/efi.h')
| -rw-r--r-- | arch/x86/include/asm/efi.h | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index fd13815fe85..6e8fdf5ad11 100644 --- 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, |