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

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

kernel os linux

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

Linus Torvalds 5 years ago c0a4f5b3 985c788b

+2 -1

2 changed files

expand all

arch

x86

pci

xen.c

drivers

video

fbdev

efifb.c

arch/x86/pci/xen.c

··· 26 26 #include <asm/xen/pci.h> 27 27 #include <asm/xen/cpuid.h> 28 28 #include <asm/apic.h> 29 + #include <asm/acpi.h> 29 30 #include <asm/i8259.h> 30 31 31 32 static int xen_pcifront_enable_irq(struct pci_dev *dev)

+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))) {