Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

efi: avoid error message when booting under Xen

efifb_probe() will issue an error message in case the kernel is booted
as Xen dom0 from UEFI as EFI_MEMMAP won't be set in this case. Avoid
that message by calling efi_mem_desc_lookup() only if EFI_MEMMAP is set.

Fixes: 38ac0287b7f4 ("fbdev/efifb: Honour UEFI memory map attributes when mapping the FB")
Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Juergen Gross <jgross@suse.com>

+1 -1
+1 -1
drivers/video/fbdev/efifb.c
··· 453 453 info->apertures->ranges[0].base = efifb_fix.smem_start; 454 454 info->apertures->ranges[0].size = size_remap; 455 455 456 - if (efi_enabled(EFI_BOOT) && 456 + if (efi_enabled(EFI_MEMMAP) && 457 457 !efi_mem_desc_lookup(efifb_fix.smem_start, &md)) { 458 458 if ((efifb_fix.smem_start + efifb_fix.smem_len) > 459 459 (md.phys_addr + (md.num_pages << EFI_PAGE_SHIFT))) {