Skip to content

Commit

Permalink
x86/efi: Delete dead code when checking for non-native
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matt Fleming committed Mar 4, 2014
1 parent 426e34c commit 099240a
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions arch/x86/platform/efi/efi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 099240a

Please sign in to comment.