diff options
authorLinus Torvalds <>2020-02-09 11:54:50 -0800
committerLinus Torvalds <>2020-02-09 11:54:50 -0800
commit6ff90aa2cfddb1bce5450cb711069315ad17bd14 (patch)
parentfdfa3a6778b194974df77b384cc71eb2e503639a (diff)
parent59365cadfbcd299b8cdbe0c165faf15767c5f166 (diff)
Merge tag 'efi-urgent-2020-02-09' of git://
Pull EFI fix from Thomas Gleixner: "A single fix for a EFI boot regression on X86 which was caused by the recent rework of the EFI memory map parsing. On systems with invalid memmap entries the cleanup function uses an value which cannot be relied on in this stage. Use the actual EFI memmap entry instead" * tag 'efi-urgent-2020-02-09' of git:// efi/x86: Fix boot regression on systems with invalid memmap entries
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 59f7f6d60cf6..ae923ee8e2b4 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -308,7 +308,7 @@ static void __init efi_clean_memmap(void)
.phys_map = efi.memmap.phys_map,
.desc_version = efi.memmap.desc_version,
.desc_size = efi.memmap.desc_size,
- .size = data.desc_size * (efi.memmap.nr_map - n_removal),
+ .size = efi.memmap.desc_size * (efi.memmap.nr_map - n_removal),
.flags = 0,