summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-20 12:21:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-20 12:21:26 -0700
commit3d3e66ba2ced6c5ba7d960f106ba2d3a4444c4ab (patch)
treef4b7f3a7258e26f51f7828d0fb01df0a81f9baff /arch/x86
parenta971dbcab969be63ca5737821c8cbd6cc26ff9ad (diff)
parent87ffd2b9bb74061c120f450e4d0f3409bb603ae0 (diff)
downloadlinux-3d3e66ba2ced6c5ba7d960f106ba2d3a4444c4ab.tar.bz2
Merge tag 'for-linus-4.2-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen build fix from David Vrabel: "Fix i386 build with an (uncommon) configuration" * tag 'for-linus-4.2-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: x86/xen: make CONFIG_XEN depend on CONFIG_X86_LOCAL_APIC
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/xen/Kconfig4
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