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

Commit 4dd8ad1d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: smp: Fix cpu_up() racing with sys_reboot"

parents 2c61d389 4d9a31f1

arch/arm/kernel/smp.c

+3 −3
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static void ipi_cpu_stop(unsigned int cpu, struct pt_regs *regs) 
		raw_spin_unlock(&stop_lock);

	}



	set_cpu_online(cpu, false);

	set_cpu_active(cpu, false);



	local_fiq_disable();

	local_irq_disable();
@@ -743,10 +743,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_warn("SMP: failed to stop secondary CPUs\n");

}