Merge "ARM64: smp: Fix cpu_up() racing with sys_reboot" (ba6ee8cf) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm64/kernel/smp.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -573,7 +573,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);

		flush_cache_all();
		local_irq_disable();
		@@ -740,10 +740,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\n");
		}