The following commit has been merged into the efi/urgent branch of tip: Commit-ID: 68c9cdf37a0456b7ba25a50b1ea8794f305da17f Gitweb: https://git.kernel.org/tip/68c9cdf37a0456b7ba25a50b1ea8794f305da17f Author: Heinrich Schuchardt <heinrich.schuchardt@xxxxxxxxxxxxx> AuthorDate: Sun, 29 Aug 2021 15:23:10 +02:00 Committer: Ard Biesheuvel <ardb@xxxxxxxxxx> CommitterDate: Tue, 05 Oct 2021 13:05:58 +02:00 efi/libstub: Simplify "Exiting bootservices" message The message "Exiting boot services and installing virtual address map...\n" is even shown if we have efi=novamap on the command line or the firmware does not provide EFI_RT_SUPPORTED_SET_VIRTUAL_ADDRESS_MAP. To avoid confusion just print "Exiting boot services...\n" Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@xxxxxxxxxxxxx> Signed-off-by: Ard Biesheuvel <ardb@xxxxxxxxxx> --- drivers/firmware/efi/libstub/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c index 365c3a4..fe567be 100644 --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c @@ -271,7 +271,7 @@ efi_status_t allocate_new_fdt_and_exit_boot(void *handle, return status; } - efi_info("Exiting boot services and installing virtual address map...\n"); + efi_info("Exiting boot services...\n"); map.map = &memory_map; status = efi_allocate_pages(MAX_FDT_SIZE, new_fdt_addr, ULONG_MAX);
![]() |