aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/platform
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2014-01-10 08:01:39 -0500
committerMatt Fleming <matt.fleming@intel.com>2014-03-04 16:24:59 -0500
commit099240ac111aac454962e6399c0cc51d1511504a (patch)
tree8260e2544cd309c5898da9308100fe136c39fc21 /arch/x86/platform
parent426e34cc4f6094cefe4f3175764cdf583128e7cd (diff)
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@suse.de> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch/x86/platform')
-rw-r--r--arch/x86/platform/efi/efi.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 1a201ac7cef8..b96ae7918a16 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)
466{ 466{
467 void *p; 467 void *p;
468 468
469 if (!efi_is_native())
470 return;
471
472 for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { 469 for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
473 efi_memory_desc_t *md = p; 470 efi_memory_desc_t *md = p;
474 unsigned long long start = md->phys_addr; 471 unsigned long long start = md->phys_addr;
@@ -1005,15 +1002,6 @@ void __init efi_enter_virtual_mode(void)
1005 1002
1006 efi.systab = NULL; 1003 efi.systab = NULL;
1007 1004
1008 /*
1009 * We don't do virtual mode, since we don't do runtime services, on
1010 * non-native EFI
1011 */
1012 if (!efi_is_native()) {
1013 efi_unmap_memmap();
1014 return;
1015 }
1016
1017 if (efi_setup) { 1005 if (efi_setup) {
1018 efi_map_regions_fixed(); 1006 efi_map_regions_fixed();
1019 } else { 1007 } else {