Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core
More EFI updates for v5.7 - Incorporate a stable branch with the EFI pieces of Hans's work on loading device firmware from EFI boot service memory regions Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -246,6 +246,7 @@ int __init efi_memblock_x86_reserve_range(void)
|
||||
efi.memmap.desc_version);
|
||||
|
||||
memblock_reserve(pmap, efi.memmap.nr_map * efi.memmap.desc_size);
|
||||
set_bit(EFI_PRESERVE_BS_REGIONS, &efi.flags);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -901,6 +902,7 @@ static void __init __efi_enter_virtual_mode(void)
|
||||
goto err;
|
||||
}
|
||||
|
||||
efi_check_for_embedded_firmwares();
|
||||
efi_free_boot_services();
|
||||
|
||||
if (!efi_is_mixed())
|
||||
|
Reference in New Issue
Block a user