Commit 4684abe3 authored Jan 03, 2020 by Ard Biesheuvel Committed by Ingo Molnar Jan 10, 2020

efi/x86: Remove unreachable code in kexec_enter_virtual_mode()



Remove some code that is guaranteed to be unreachable, given
that we have already bailed by this time if EFI_OLD_MEMMAP is
set.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Arvind Sankar <nivedita@alum.mit.edu>
Cc: Matthew Garrett <mjg59@google.com>
Cc: linux-efi@vger.kernel.org
Link: https://lkml.kernel.org/r/20200103113953.9571-15-ardb@kernel.org


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent e2d68a95

arch/x86/platform/efi/efi.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -850,9 +850,6 @@ static void __init kexec_enter_virtual_mode(void)
		efi.runtime_version = efi_systab.hdr.revision;

		efi_native_runtime_setup();

		if (efi_enabled(EFI_OLD_MEMMAP) && (__supported_pte_mask & _PAGE_NX))
		runtime_code_page_mkexec();
		#endif
		}

Admin message