summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-01-20 11:46:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-01-20 11:46:38 -0800
commit2e4ceed606ba4942f632d097f70696543fe98d8e (patch)
tree9fa08d8b48c2988bcf89e1f2ab5d8e9eb6eb461c /arch
parent7178a107f5ea7bdb1cc23073234f0ded0ef90ec7 (diff)
parentbd9dcef67ffcae2de49e319fba349df76472fd10 (diff)
downloadlinux-2e4ceed606ba4942f632d097f70696543fe98d8e.tar.bz2
Merge tag 'for-linus-5.11-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fix from Juergen Gross: "A fix for build failure showing up in some configurations" * tag 'for-linus-5.11-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: x86/xen: fix 'nopvspin' build error
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/xen/smp_hvm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/xen/smp_hvm.c b/arch/x86/xen/smp_hvm.c
index 056430a1080b..6ff3c887e0b9 100644
--- a/arch/x86/xen/smp_hvm.c
+++ b/arch/x86/xen/smp_hvm.c
@@ -74,7 +74,9 @@ void __init xen_hvm_smp_init(void)
smp_ops.cpu_die = xen_hvm_cpu_die;
if (!xen_have_vector_callback) {
+#ifdef CONFIG_PARAVIRT_SPINLOCKS
nopvspin = true;
+#endif
return;
}