diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-08-19 11:56:32 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-09-18 19:59:43 +1000 |
| commit | 1ea21ba231f248034e8c794aa675869ca2b97d42 (patch) | |
| tree | e5a7f46657901c06600521f505158cf1b85b3b50 | |
| parent | d10ebe79dfae7dc59b6cf77ffa615f0b8dae21bf (diff) | |
powerpc: Move arch_cpu_idle_dead() into smp.c
arch_cpu_idle_dead() is in idle.c, which makes sense, but it's inside
a CONFIG_HOTPLUG_CPU block.
It would be more at home in smp.c, inside the existing
CONFIG_HOTPLUG_CPU block. Note that CONFIG_HOTPLUG_CPU depends on
CONFIG_SMP so even though smp.c is not built for SMP=n builds, that's
fine.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200819015634.1974478-1-mpe@ellerman.id.au
| -rw-r--r-- | arch/powerpc/kernel/idle.c | 8 | ||||
| -rw-r--r-- | arch/powerpc/kernel/smp.c | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c index 422e31d2f5a2..ae0e2632393d 100644 --- a/arch/powerpc/kernel/idle.c +++ b/arch/powerpc/kernel/idle.c @@ -41,14 +41,6 @@ static int __init powersave_off(char *arg) } __setup("powersave=off", powersave_off); -#ifdef CONFIG_HOTPLUG_CPU -void arch_cpu_idle_dead(void) -{ - sched_preempt_enable_no_resched(); - cpu_die(); -} -#endif - void arch_cpu_idle(void) { ppc64_runlatch_off(); diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 3d96752d6570..24b0476c1d4f 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -1489,6 +1489,12 @@ void __cpu_die(unsigned int cpu) smp_ops->cpu_die(cpu); } +void arch_cpu_idle_dead(void) +{ + sched_preempt_enable_no_resched(); + cpu_die(); +} + void cpu_die(void) { /* |