Merge "ARM: smp: Fix hrtimer_interrupt race with sys_reboot" (d707d76b) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/kernel/smp.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -549,7 +549,7 @@ static void ipi_cpu_stop(unsigned int cpu)
		raw_spin_unlock(&stop_lock);
		}

		set_cpu_online(cpu, false);
		set_cpu_active(cpu, false);

		local_fiq_disable();
		local_irq_disable();
		@@ -726,10 +726,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");
		}