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

Commit 61b85983 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM64: smp: Fix cpu_up() racing with sys_reboot" into msm-4.8

parents a755ecb2 30b3a6ef

arch/arm64/kernel/smp.c

+3 −3
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ void arch_irq_work_raise(void) 
 */

static void ipi_cpu_stop(unsigned int cpu)

{

	set_cpu_online(cpu, false);

	set_cpu_active(cpu, false);



	local_irq_disable();
@@ -915,10 +915,10 @@ void smp_send_stop(void) 


	/* Wait up to one second for other CPUs to stop */

	timeout = USEC_PER_SEC;

	while (num_online_cpus() > 1 && timeout--)

	while (num_active_cpus() > 1 && timeout--)

		udelay(1);



	if (num_online_cpus() > 1)

	if (num_active_cpus() > 1)

		pr_warning("SMP: failed to stop secondary CPUs %*pbl\n",

			   cpumask_pr_args(cpu_online_mask));

}