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

Commit 944f0908 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: smp: Use common outgoing-CPU-notification code"

parents d4a4e3c2 cf9c2855
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -239,15 +239,13 @@ int __cpu_disable(void)
	return 0;
}

static DECLARE_COMPLETION(cpu_died);

/*
 * called on the thread which is asking for a CPU to be shutdown -
 * waits until shutdown has completed, or it is timed out.
 */
void __cpu_die(unsigned int cpu)
{
	if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) {
	if (!cpu_wait_death(cpu, 5)) {
		pr_err("CPU%u: cpu didn't die\n", cpu);
		return;
	}
@@ -293,7 +291,7 @@ void arch_cpu_idle_dead(void)
	 * this returns, power and/or clocks can be removed at any point
	 * from this CPU and its cache by platform_cpu_kill().
	 */
	complete(&cpu_died);
	(void)cpu_report_death();

	/*
	 * Ensure that the cache lines associated with that completion are