summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-12-22 19:37:48 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2023-12-22 19:37:48 +0300
commitb7bc7bce88bdf52ec2b47c576fb51269a521bd9a (patch)
tree39e90679bfe8a26edcc5c2a2aa9bbb5f215ca4b2 /arch
parent8afe6f0e0e257bf7f79f5996c037e8977dcc8cc1 (diff)
parent93cd0597649844a0fe7989839a3202735fb3ae67 (diff)
downloadlinux-b7bc7bce88bdf52ec2b47c576fb51269a521bd9a.tar.xz
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
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/xen/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 9b1ec5d8c99c..a65fc2ae15b4 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -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