path: root/arch
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2019-10-12 15:08:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-10-12 15:08:24 -0700
commit9b4e40c8fe1e120fef93985de7ff6a97fe9e7dd3 (patch)
treee337504dc1e26bee83b451997adcf0446038bce3 /arch
parentfcb45a28489c981bcdab510a838fcac5c21c07e2 (diff)
parentbe59d57f98065af0b8472f66a0a969207b168680 (diff)
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Ingo Molnar: "Misc EFI fixes all across the map: CPER error report fixes, fixes to TPM event log parsing, fix for a kexec hang, a Sparse fix and other fixes" * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi/tpm: Fix sanity check of unsigned tbl_size being less than zero efi/x86: Do not clean dummy variable in kexec path efi: Make unexported efi_rci2_sysfs_init() static efi/tpm: Only set 'efi_tpm_final_log_size' after successful event log parsing efi/tpm: Don't traverse an event log with no events efi/tpm: Don't access event->count when it isn't mapped efivar/ssdt: Don't iterate over EFI vars if no SSDT override was specified efi/cper: Fix endianness of PCIe class code
Diffstat (limited to 'arch')
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index c202e1b07e29..425e025341db 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -917,9 +917,6 @@ static void __init kexec_enter_virtual_mode(void)
if (efi_enabled(EFI_OLD_MEMMAP) && (__supported_pte_mask & _PAGE_NX))
- /* clean DUMMY object */
- efi_delete_dummy_variable();

Privacy Policy