Commit bde6b37e authored Dec 15, 2017 by Linus Torvalds

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

Pull xen fixes from Juergen Gross:
 "Two minor fixes for running as Xen dom0:

   - when built as 32 bit kernel on large machines the Xen LAPIC
     emulation should report a rather modern LAPIC in order to support
     enough APIC-Ids

   - The Xen LAPIC emulation is needed for dom0 only, so build it only
     for kernels supporting to run as Xen dom0"

* tag 'for-linus-4.15-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: XEN_ACPI_PROCESSOR is Dom0-only
  x86/Xen: don't report ancient LAPIC version

parents 032b4cc8 c4f9d9cb

arch/x86/xen/apic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ static u32 xen_apic_read(u32 reg)
		return 0;

		if (reg == APIC_LVR)
		return 0x10;
		return 0x14;
		#ifdef CONFIG_X86_32
		if (reg == APIC_LDR)
		return SET_APIC_LOGICAL_ID(1UL << smp_processor_id());

drivers/xen/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -269,7 +269,7 @@ config XEN_ACPI_HOTPLUG_CPU

		config XEN_ACPI_PROCESSOR
		tristate "Xen ACPI processor"
		depends on XEN && X86 && ACPI_PROCESSOR && CPU_FREQ
		depends on XEN && XEN_DOM0 && X86 && ACPI_PROCESSOR && CPU_FREQ
		default m
		help
		This ACPI processor uploads Power Management information to the Xen

Admin message