diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2020-01-03 12:39:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-01-10 18:55:03 +0100 |
| commit | 4684abe375927e745974bfddd85e171a3eb887a5 (patch) | |
| tree | 1d413e51dfd5777ddbafe40128d00299afc510f0 | |
| parent | e2d68a955e49d61fd0384f23e92058dc9b79be5e (diff) | |
| download | linux-stable-4684abe375927e745974bfddd85e171a3eb887a5.tar.gz linux-stable-4684abe375927e745974bfddd85e171a3eb887a5.tar.bz2 linux-stable-4684abe375927e745974bfddd85e171a3eb887a5.zip | |
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>
| -rw-r--r-- | arch/x86/platform/efi/efi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 4f539bfdc051..b931c4bea284 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -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 } |