Commit 2e4ceed6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7178a107 bd9dcef6

arch/x86/xen/smp_hvm.c

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

	}