Commit c0a4f5b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fixes from Juergen Gross:
 "One build fix and a minor fix for suppressing a useless warning when
  booting a Xen dom0 via UEFI"

* tag 'for-linus-5.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  Fix build error when CONFIG_ACPI is not set/enabled:
  efi: avoid error message when booting under Xen
parents 985c788b ee87e155

arch/x86/pci/xen.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/xen/pci.h>

#include <asm/xen/cpuid.h>

#include <asm/apic.h>

#include <asm/acpi.h>

#include <asm/i8259.h>



static int xen_pcifront_enable_irq(struct pci_dev *dev)

drivers/video/fbdev/efifb.c

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ static int efifb_probe(struct platform_device *dev) 
	info->apertures->ranges[0].base = efifb_fix.smem_start;

	info->apertures->ranges[0].size = size_remap;



	if (efi_enabled(EFI_BOOT) &&

	if (efi_enabled(EFI_MEMMAP) &&

	    !efi_mem_desc_lookup(efifb_fix.smem_start, &md)) {

		if ((efifb_fix.smem_start + efifb_fix.smem_len) >

		    (md.phys_addr + (md.num_pages << EFI_PAGE_SHIFT))) {