summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-12-15 11:32:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-12-15 11:32:09 -0800
commitbde6b37e49831d0a6452c39ce2b53662afec78af (patch)
tree0cfcfad7e7311bc6f3cde6751789a618cd225bf0 /arch
parent032b4cc8ff84490c4bc7c4ef8c91e6d83a637538 (diff)
parentc4f9d9cb2c29ff04c6b4bb09b72802d8aedfc7cb (diff)
downloadlinux-bde6b37e49831d0a6452c39ce2b53662afec78af.tar.bz2
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
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/xen/apic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
index 6b830d4cb4c8..de58533d3664 100644
--- a/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@ -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());