diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-05-29 20:05:25 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-06-21 15:20:57 +0300 |
| commit | c4de65696d865c225fda3b9913b31284ea65ea96 (patch) | |
| tree | da7dc678d2b04e58bc8fb06140ae5d72e82a752f /kernel/cpu.c | |
| parent | f048c399e0f7490ab7296bc2c255d37eb14a9675 (diff) | |
| download | linux-c4de65696d865c225fda3b9913b31284ea65ea96.tar.xz | |
cpu/hotplug: Make bringup/teardown of smp threads symmetric
The asymmetry caused a warning to trigger if the bootup was stopped in state
CPUHP_AP_ONLINE_IDLE. The warning no longer triggers as kthread_park() can
now be invoked on already or still parked threads. But there is still no
reason to have this be asymmetric.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 0db8938fbb23..61396b3e9058 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -754,7 +754,6 @@ static int takedown_cpu(unsigned int cpu) /* Park the smpboot threads */ kthread_park(per_cpu_ptr(&cpuhp_state, cpu)->thread); - smpboot_park_threads(cpu); /* * Prevent irq alloc/free while the dying cpu reorganizes the @@ -1332,7 +1331,7 @@ static struct cpuhp_step cpuhp_hp_states[] = { [CPUHP_AP_SMPBOOT_THREADS] = { .name = "smpboot/threads:online", .startup.single = smpboot_unpark_threads, - .teardown.single = NULL, + .teardown.single = smpboot_park_threads, }, [CPUHP_AP_IRQ_AFFINITY_ONLINE] = { .name = "irq/affinity:online", |