| Message ID | 20221018182545.143757-1-ardb@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [for-stable] efi: libstub: drop pointless get_memory_map() call | expand |
On Tue, Oct 18, 2022 at 08:25:45PM +0200, Ard Biesheuvel wrote: > commit d80ca810f096ff66f451e7a3ed2f0cd9ef1ff519 upstream > > Currently, the non-x86 stub code calls get_memory_map() redundantly, > given that the data it returns is never used anywhere. So drop the call. > > Cc: <stable@vger.kernel.org> # v4.14+ > Fixes: 24d7c494ce46 ("efi/arm-stub: Round up FDT allocation to mapping size") > Signed-off-by: Ard Biesheuvel <ardb@kernel.org> > --- > drivers/firmware/efi/libstub/fdt.c | 8 -------- > 1 file changed, 8 deletions(-) > > This is a backport for v5.4 and older, where the patch in question did > not apply cleanly on the first attempt. Please apply. Thanks, now queued up. greg k-h
diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c index dba296a44f4e..2a1a587edef9 100644 --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c @@ -301,14 +301,6 @@ efi_status_t allocate_new_fdt_and_exit_boot(efi_system_table_t *sys_table, goto fail; } - /* - * Now that we have done our final memory allocation (and free) - * we can get the memory map key needed for exit_boot_services(). - */ - status = efi_get_memory_map(sys_table, &map); - if (status != EFI_SUCCESS) - goto fail_free_new_fdt; - status = update_fdt(sys_table, (void *)fdt_addr, fdt_size, (void *)*new_fdt_addr, MAX_FDT_SIZE, cmdline_ptr, initrd_addr, initrd_size);
commit d80ca810f096ff66f451e7a3ed2f0cd9ef1ff519 upstream Currently, the non-x86 stub code calls get_memory_map() redundantly, given that the data it returns is never used anywhere. So drop the call. Cc: <stable@vger.kernel.org> # v4.14+ Fixes: 24d7c494ce46 ("efi/arm-stub: Round up FDT allocation to mapping size") Signed-off-by: Ard Biesheuvel <ardb@kernel.org> --- drivers/firmware/efi/libstub/fdt.c | 8 -------- 1 file changed, 8 deletions(-) This is a backport for v5.4 and older, where the patch in question did not apply cleanly on the first attempt. Please apply.