Commit e4987cc7 authored by David Vrabel's avatar David Vrabel Committed by Kamal Mostafa

x86/xen: make CONFIG_XEN depend on CONFIG_X86_LOCAL_APIC

commit 87ffd2b9 upstream.

Since commit feb44f1f (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: default avatarDavid Vrabel <david.vrabel@citrix.com>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 240fcd54
...@@ -8,7 +8,7 @@ config XEN ...@@ -8,7 +8,7 @@ config XEN
select PARAVIRT_CLOCK select PARAVIRT_CLOCK
select XEN_HAVE_PVMMU select XEN_HAVE_PVMMU
depends on X86_64 || (X86_32 && X86_PAE) depends on X86_64 || (X86_32 && X86_PAE)
depends on X86_TSC depends on X86_LOCAL_APIC && X86_TSC
help help
This is the Linux Xen port. Enabling this will allow the This is the Linux Xen port. Enabling this will allow the
kernel to boot in a paravirtualized environment under the kernel to boot in a paravirtualized environment under the
...@@ -17,7 +17,7 @@ config XEN ...@@ -17,7 +17,7 @@ config XEN
config XEN_DOM0 config XEN_DOM0
def_bool y def_bool y
depends on XEN && PCI_XEN && SWIOTLB_XEN 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 config XEN_PVHVM
def_bool y def_bool y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment