Merge tag 'for-linus-5.11-rc5-tag' of git://git.kernel.org/pub/scm/li…

…nux/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
mariux64 · Jan 20, 2021 · 2e4ceed · 2e4ceed
2 parents 7178a10 + bd9dcef
commit 2e4ceed
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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;
 	}