diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2015-08-20 13:33:41 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-09-22 22:20:20 +0300 |
| commit | d8f6849de3b77ae60b37f5c2340806f3ecf9d33e (patch) | |
| tree | c7afaaf15d205eee66e5f2190dcfa8fbfb704d98 | |
| parent | d91c1922f63ce2231c97038a3534012d6ac03ed7 (diff) | |
| download | linux-d8f6849de3b77ae60b37f5c2340806f3ecf9d33e.tar.xz | |
x86/xen: make CONFIG_XEN depend on CONFIG_X86_LOCAL_APIC
[ Upstream commit 87ffd2b9bb74061c120f450e4d0f3409bb603ae0 ]
Since commit feb44f1f7a4ac299d1ab1c3606860e70b9b89d69 (x86/xen:
Provide a "Xen PV" APIC driver to support >255 VCPUs) Xen guests need
a full APIC driver and thus should depend on X86_LOCAL_APIC.
This fixes an i386 build failure with !SMP && !CONFIG_X86_UP_APIC by
disabling Xen support in this configuration.
Users needing Xen support in a non-SMP i386 kernel will need to enable
CONFIG_X86_UP_APIC.
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | arch/x86/xen/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index e88fda867a33..484145368a24 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -8,7 +8,7 @@ config XEN select PARAVIRT_CLOCK select XEN_HAVE_PVMMU depends on X86_64 || (X86_32 && X86_PAE) - depends on X86_TSC + depends on X86_LOCAL_APIC && X86_TSC help This is the Linux Xen port. Enabling this will allow the kernel to boot in a paravirtualized environment under the @@ -17,7 +17,7 @@ config XEN config XEN_DOM0 def_bool y depends on XEN && PCI_XEN && SWIOTLB_XEN - depends on X86_LOCAL_APIC && X86_IO_APIC && ACPI && PCI + depends on X86_IO_APIC && ACPI && PCI config XEN_PVHVM def_bool y |