History

Merge tag 'efi-urgent-2020-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

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://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi/x86: Fix boot regression on systems with invalid memmap entries

Linus Torvalds committed 6 years ago

Commit 6ff90aa2 parents fdfa3a6 59365ca1 file · +1 −1Browse files

Unified · Split

arch/x86/platform/efi/efi.c+1−1
@@ -308,7 +308,7 @@ static void __init efi_clean_memmap(void) · 307 unmodified lines
308308 .phys_map = efi.memmap.phys_map,
309309 .desc_version = efi.memmap.desc_version,
310310 .desc_size = efi.memmap.desc_size,
311− .size = data.desc_size * (efi.memmap.nr_map - n_removal),
311+ .size = efi.memmap.desc_size * (efi.memmap.nr_map - n_removal),
312312 .flags = 0,
313313 };
314314

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t