Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 090d54bc authored by Zhenzhong Duan's avatar Zhenzhong Duan Committed by Juergen Gross
Browse files

Revert "x86/paravirt: Set up the virt_spin_lock_key after static keys get initialized" 



This reverts commit ca5d376e.

Commit 8990cac6 ("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: default avatarZhenzhong Duan <zhenzhong.duan@oracle.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent bce5963b

arch/x86/kernel/smpboot.c

+1 −2
Original line number Diff line number Diff line
@@ -1368,8 +1368,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) 
	pr_info("CPU0: ");

	print_cpu_info(&cpu_data(0));



	native_pv_lock_init();



	uv_system_init();



	set_mtrr_aps_delayed_init();
@@ -1399,6 +1397,7 @@ void __init native_smp_prepare_boot_cpu(void) 
	/* already set me in cpu_online_mask in boot_cpu_init() */

	cpumask_set_cpu(me, cpu_callout_mask);

	cpu_set_state_online(me);

	native_pv_lock_init();

}



void __init calculate_max_logical_packages(void)

arch/x86/xen/spinlock.c

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