Commit-ID: 099240ac111aac454962e6399c0cc51d1511504a
Gitweb: http://git.kernel.org/tip/099240ac111aac454962e6399c0cc51d1511504a
Author: Matt Fleming <matt.fleming@xxxxxxxxx>
AuthorDate: Fri, 10 Jan 2014 13:01:39 +0000
Committer: Matt Fleming <matt.fleming@xxxxxxxxx>
CommitDate: Tue, 4 Mar 2014 21:24:59 +0000
x86/efi: Delete dead code when checking for non-native
Both efi_free_boot_services() and efi_enter_virtual_mode() are invoked
from init/main.c, but only if the EFI runtime services are available.
This is not the case for non-native boots, e.g. where a 64-bit kernel is
booted with 32-bit EFI firmware.
Delete the dead code.
Acked-by: Borislav Petkov <bp@xxxxxxx>
Signed-off-by: Matt Fleming <matt.fleming@xxxxxxxxx>
---
arch/x86/platform/efi/efi.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 1a201ac..b96ae79 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -466,9 +466,6 @@ void __init efi_free_boot_services(void)
{
void *p;
- if (!efi_is_native())
- return;
-
for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
efi_memory_desc_t *md = p;
unsigned long long start = md->phys_addr;
@@ -1005,15 +1002,6 @@ void __init efi_enter_virtual_mode(void)
efi.systab = NULL;
- /*
- * We don't do virtual mode, since we don't do runtime services, on
- * non-native EFI
- */
- if (!efi_is_native()) {
- efi_unmap_memmap();
- return;
- }
-
if (efi_setup) {
efi_map_regions_fixed();
} else {
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|