Commit d80ca810 authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

efi: libstub: drop pointless get_memory_map() call 



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>
parent ead384d9

drivers/firmware/efi/libstub/fdt.c

+0 −8
Original line number Diff line number Diff line
@@ -280,14 +280,6 @@ efi_status_t allocate_new_fdt_and_exit_boot(void *handle, 
		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(&map);

	if (status != EFI_SUCCESS)

		goto fail_free_new_fdt;



	status = update_fdt((void *)fdt_addr, fdt_size,

			    (void *)*new_fdt_addr, MAX_FDT_SIZE, cmdline_ptr,

			    initrd_addr, initrd_size);