diff options
| author |   Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-05-12 14:50:05 -0700 |
|---|---|---|
| committer |   Catalin Marinas <catalin.marinas@arm.com> | 2015-05-21 14:24:26 +0100 |
| commit | 05981277a4de1ad631a4b2c39c4fbc1db69b6f23 (patch) | |
| tree | c6b224570f92de5e767abb5accb847b619ebbd50 /arch/arm64/kernel | |
| parent | arm64: perf: Fix callchain parse error with kernel tracepoint events (diff) | |
| download | linux-dev-05981277a4de1ad631a4b2c39c4fbc1db69b6f23.tar.xz linux-dev-05981277a4de1ad631a4b2c39c4fbc1db69b6f23.zip | |
arm64: Use common outgoing-CPU-notification code
This commit removes the open-coded CPU-offline notification with new
common code. In particular, this change avoids calling scheduler code
using RCU from an offline CPU that RCU is ignoring. This is a minimal
change. A more intrusive change might invoke the cpu_check_up_prepare()
and cpu_set_state_online() functions at CPU-online time, which would
allow onlining throw an error if the CPU did not go offline properly.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: linux-arm-kernel@lists.infradead.org
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/smp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index b698208848e9..65f1a7f72697 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -254,15 +254,13 @@ static int op_cpu_kill(unsigned int cpu) return cpu_ops[cpu]->cpu_kill(cpu); } -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_crit("CPU%u: cpu didn't die\n", cpu); return; } @@ -295,7 +293,7 @@ void cpu_die(void) local_irq_disable(); /* Tell __cpu_die() that this CPU is now safe to dispose of */ - complete(&cpu_died); + (void)cpu_report_death(); /* * Actually shutdown the CPU. This must never fail. The specific hotplug |