diff options
author | David Vrabel <david.vrabel@citrix.com> | 2015-08-20 06:33:41 -0400 |
---|---|---|
committer | David Vrabel <david.vrabel@citrix.com> | 2015-08-20 06:45:43 -0400 |
commit | 87ffd2b9bb74061c120f450e4d0f3409bb603ae0 (patch) | |
tree | 33ea55cc52c35d5a9bbe54f90252a870642db396 | |
parent | c22fe519e7e2b94ad173e0ea3b89c1a7d8be8d00 (diff) |
x86/xen: make CONFIG_XEN depend on CONFIG_X86_LOCAL_APIC
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>
-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 | |||
8 | select PARAVIRT_CLOCK | 8 | select PARAVIRT_CLOCK |
9 | select XEN_HAVE_PVMMU | 9 | select XEN_HAVE_PVMMU |
10 | depends on X86_64 || (X86_32 && X86_PAE) | 10 | depends on X86_64 || (X86_32 && X86_PAE) |
11 | depends on X86_TSC | 11 | depends on X86_LOCAL_APIC && X86_TSC |
12 | help | 12 | help |
13 | This is the Linux Xen port. Enabling this will allow the | 13 | This is the Linux Xen port. Enabling this will allow the |
14 | kernel to boot in a paravirtualized environment under the | 14 | kernel to boot in a paravirtualized environment under the |
@@ -17,7 +17,7 @@ config XEN | |||
17 | config XEN_DOM0 | 17 | config XEN_DOM0 |
18 | def_bool y | 18 | def_bool y |
19 | depends on XEN && PCI_XEN && SWIOTLB_XEN | 19 | depends on XEN && PCI_XEN && SWIOTLB_XEN |
20 | depends on X86_LOCAL_APIC && X86_IO_APIC && ACPI && PCI | 20 | depends on X86_IO_APIC && ACPI && PCI |
21 | 21 | ||
22 | config XEN_PVHVM | 22 | config XEN_PVHVM |
23 | def_bool y | 23 | def_bool y |