Commit b7bc7bce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-6.7a-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fix from Juergen Gross:
 "A single patch fixing a build issue for x86 32-bit configurations with
  CONFIG_XEN, which was introduced in the 6.7 development cycle"

* tag 'for-linus-6.7a-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86/xen: add CPU dependencies for 32-bit build
parents 8afe6f0e 93cd0597

arch/x86/xen/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config XEN 
	select PARAVIRT_CLOCK

	select X86_HV_CALLBACK_VECTOR

	depends on X86_64 || (X86_32 && X86_PAE)

	depends on X86_64 || (X86_GENERIC || MPENTIUM4 || MCORE2 || MATOM || MK8)

	depends on X86_LOCAL_APIC && X86_TSC

	help

	  This is the Linux Xen port.  Enabling this will allow the