Skip to content

Commit

Permalink
Merge tag 'for-linus-5.11-rc5-tag' of git://git.kernel.org/pub/scm/li…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Linus Torvalds committed Jan 20, 2021
2 parents 7178a10 + bd9dcef commit 2e4ceed
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/x86/xen/smp_hvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 2e4ceed

Please sign in to comment.