diff options
| author | Paul E. McKenney <paulmck@linux.ibm.com> | 2019-08-13 14:41:48 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.ibm.com> | 2019-08-13 14:41:48 -0700 |
| commit | 07f038a408fb215fd656de78304b6ff4c7e4e490 (patch) | |
| tree | 7e78a89f7a5981382d252cafcc58d9a4d66c9957 /arch/arm/kernel | |
| parent | 6738ff85c3ee8073d5b030cb26241d0009d4ce29 (diff) | |
| parent | cfcdef5e30469f3f2d6786ad35fc3fdef2a3833f (diff) | |
| download | lwn-07f038a408fb215fd656de78304b6ff4c7e4e490.tar.gz lwn-07f038a408fb215fd656de78304b6ff4c7e4e490.zip | |
Merge LKMM and RCU commits
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/smp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index aab8ba40ce38..4b0bab2607e4 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -264,15 +264,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; } @@ -319,7 +317,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 |