Skip to content

Commit 6163a98

Browse files
committed
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: 38ac028 ("fbdev/efifb: Honour UEFI memory map attributes when mapping the FB") Signed-off-by: Juergen Gross <[email protected]> Acked-by: Ard Biesheuvel <[email protected]> Acked-by: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Juergen Gross <[email protected]>
1 parent 585c6ed commit 6163a98

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/video/fbdev/efifb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ static int efifb_probe(struct platform_device *dev)
453453
info->apertures->ranges[0].base = efifb_fix.smem_start;
454454
info->apertures->ranges[0].size = size_remap;
455455

456-
if (efi_enabled(EFI_BOOT) &&
456+
if (efi_enabled(EFI_MEMMAP) &&
457457
!efi_mem_desc_lookup(efifb_fix.smem_start, &md)) {
458458
if ((efifb_fix.smem_start + efifb_fix.smem_len) >
459459
(md.phys_addr + (md.num_pages << EFI_PAGE_SHIFT))) {

0 commit comments

Comments
 (0)