diff options
| author | Zhenzhong Duan | 2019-06-26 10:57:09 +0200 |
|---|---|---|
| committer | Juergen Gross | 2019-07-17 08:09:57 +0200 |
| commit | 090d54bcbc54af75e94442e60f42d973341a5f53 (patch) | |
| tree | 1242e2b61791af6b921eaf6bc2c2514e7d38f62e /arch/x86/xen | |
| parent | xen/events: fix binding user event channels to cpus (diff) | |
| download | kernel-qcow2-linux-090d54bcbc54af75e94442e60f42d973341a5f53.tar.gz kernel-qcow2-linux-090d54bcbc54af75e94442e60f42d973341a5f53.tar.xz kernel-qcow2-linux-090d54bcbc54af75e94442e60f42d973341a5f53.zip | |
Revert "x86/paravirt: Set up the virt_spin_lock_key after static keys get initialized"
This reverts commit ca5d376e17072c1b60c3fee66f3be58ef018952d.
Commit 8990cac6e5ea ("x86/jump_label: Initialize static branching
early") adds jump_label_init() call in setup_arch() to make static
keys initialized early, so we could use the original simpler code
again.
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/spinlock.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c index 3776122c87cc..6deb49094c60 100644 --- a/arch/x86/xen/spinlock.c +++ b/arch/x86/xen/spinlock.c @@ -68,11 +68,8 @@ void xen_init_lock_cpu(int cpu) int irq; char *name; - if (!xen_pvspin) { - if (cpu == 0) - static_branch_disable(&virt_spin_lock_key); + if (!xen_pvspin) return; - } WARN(per_cpu(lock_kicker_irq, cpu) >= 0, "spinlock on CPU%d exists on IRQ%d!\n", cpu, per_cpu(lock_kicker_irq, cpu)); @@ -124,6 +121,7 @@ void __init xen_init_spinlocks(void) if (!xen_pvspin) { printk(KERN_DEBUG "xen: PV spinlocks disabled\n"); + static_branch_disable(&virt_spin_lock_key); return; } printk(KERN_DEBUG "xen: PV spinlocks enabled\n"); |