Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d3e66ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a971dbca 87ffd2b9

arch/x86/xen/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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