Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96e2e212 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Greg Kroah-Hartman
Browse files

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: 24d7c494 ("efi/arm-stub: Round up FDT allocation to mapping size")
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 97238b88

drivers/firmware/efi/libstub/fdt.c

+0 −8
Original line number Diff line number Diff line
@@ -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);