Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 099240ac authored by Matt Fleming's avatar Matt Fleming
Browse files

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: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 426e34cc

arch/x86/platform/efi/efi.c

+0 −12
Original line number Diff line number Diff line
@@ -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 {