diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2022-09-15 19:00:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-26 13:23:00 +0200 |
| commit | 96e2e21284ca4b1153fbc71811a3022ffa2850e5 (patch) | |
| tree | 44d933638e7cf41ee48107af69cf7e66d8235424 | |
| parent | 97238b88583c27c9d3b4a0cedb45f816523f17c3 (diff) | |
| download | linux-stable-96e2e21284ca4b1153fbc71811a3022ffa2850e5.tar.gz linux-stable-96e2e21284ca4b1153fbc71811a3022ffa2850e5.tar.bz2 linux-stable-96e2e21284ca4b1153fbc71811a3022ffa2850e5.zip | |
efi: libstub: drop pointless get_memory_map() call
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/firmware/efi/libstub/fdt.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c index 0bf0190917e0..9d9a3b698351 100644 --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c @@ -291,14 +291,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); |