Commit bf3c1464 authored by Michael Ellerman's avatar Michael Ellerman

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: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200819015634.1974478-2-mpe@ellerman.id.au
parent 1ea21ba2
...@@ -30,7 +30,6 @@ extern int spinning_secondaries; ...@@ -30,7 +30,6 @@ extern int spinning_secondaries;
extern u32 *cpu_to_phys_id; extern u32 *cpu_to_phys_id;
extern bool coregroup_enabled; extern bool coregroup_enabled;
extern void cpu_die(void);
extern int cpu_to_chip_id(int cpu); extern int cpu_to_chip_id(int cpu);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
......
...@@ -1492,11 +1492,7 @@ void __cpu_die(unsigned int cpu) ...@@ -1492,11 +1492,7 @@ void __cpu_die(unsigned int cpu)
void arch_cpu_idle_dead(void) void arch_cpu_idle_dead(void)
{ {
sched_preempt_enable_no_resched(); sched_preempt_enable_no_resched();
cpu_die();
}
void cpu_die(void)
{
/* /*
* Disable on the down path. This will be re-enabled by * Disable on the down path. This will be re-enabled by
* start_secondary() via start_secondary_resume() below * start_secondary() via start_secondary_resume() below
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment