diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 18:15:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 18:20:41 -0500 |
commit | 11520e5e7c1855fc3bf202bb3be35a39d9efa034 (patch) | |
tree | 734ea170f825000dceef3f724dff474b46fce11d /arch/x86/platform/efi/efi_64.c | |
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/platform/efi/efi_64.c')
-rw-r--r-- | arch/x86/platform/efi/efi_64.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index 06c8b2e662ab..95fd505dfeb6 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c | |||
@@ -58,21 +58,6 @@ static void __init early_code_mapping_set_exec(int executable) | |||
58 | } | 58 | } |
59 | } | 59 | } |
60 | 60 | ||
61 | unsigned long efi_call_virt_prelog(void) | ||
62 | { | ||
63 | unsigned long saved; | ||
64 | |||
65 | saved = read_cr3(); | ||
66 | write_cr3(real_mode_header->trampoline_pgd); | ||
67 | |||
68 | return saved; | ||
69 | } | ||
70 | |||
71 | void efi_call_virt_epilog(unsigned long saved) | ||
72 | { | ||
73 | write_cr3(saved); | ||
74 | } | ||
75 | |||
76 | void __init efi_call_phys_prelog(void) | 61 | void __init efi_call_phys_prelog(void) |
77 | { | 62 | { |
78 | unsigned long vaddress; | 63 | unsigned long vaddress; |