diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-20 11:46:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-20 11:46:38 -0800 |
| commit | 2e4ceed606ba4942f632d097f70696543fe98d8e (patch) | |
| tree | 9fa08d8b48c2988bcf89e1f2ab5d8e9eb6eb461c | |
| parent | X.509: Fix crash caused by NULL pointer (diff) | |
| parent | x86/xen: fix 'nopvspin' build error (diff) | |
| download | linux-rng-2e4ceed606ba4942f632d097f70696543fe98d8e.tar.xz linux-rng-2e4ceed606ba4942f632d097f70696543fe98d8e.zip | |
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
| -rw-r--r-- | arch/x86/xen/smp_hvm.c | 2 |
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; } |