diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-08-19 04:56:33 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-09-18 12:59:43 +0300 |
| commit | bf3c1464db883a953ad7bbed64924480b8b2b244 (patch) | |
| tree | 0a5f81aa0771bfa63429cddb7cc8365ac3c9a586 /arch | |
| parent | 1ea21ba231f248034e8c794aa675869ca2b97d42 (diff) | |
| download | linux-bf3c1464db883a953ad7bbed64924480b8b2b244.tar.xz | |
powerpc/smp: Fold cpu_die() into its only caller
Avoid the eternal confusion between cpu_die() and __cpu_die() by
removing the former, folding it into its only caller.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200819015634.1974478-2-mpe@ellerman.id.au
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/include/asm/smp.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/smp.c | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h index 041f0b97c45b..0bf80c5b440a 100644 --- a/arch/powerpc/include/asm/smp.h +++ b/arch/powerpc/include/asm/smp.h @@ -30,7 +30,6 @@ extern int spinning_secondaries; extern u32 *cpu_to_phys_id; extern bool coregroup_enabled; -extern void cpu_die(void); extern int cpu_to_chip_id(int cpu); #ifdef CONFIG_SMP diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 24b0476c1d4f..4ae767c455b8 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -1492,11 +1492,7 @@ void __cpu_die(unsigned int cpu) void arch_cpu_idle_dead(void) { sched_preempt_enable_no_resched(); - cpu_die(); -} -void cpu_die(void) -{ /* * Disable on the down path. This will be re-enabled by * start_secondary() via start_secondary_resume() below |