diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-05-29 19:05:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-15 17:37:25 +0200 |
| commit | 6249d3232f222d454a4da3e6ac7efd01137f8400 (patch) | |
| tree | 8bd51a8156482f5ce93cb241e8e2fd8bb9d4732f | |
| parent | 2883a1f89b50caa8dc1a6cc73d35c8b4642eae20 (diff) | |
| download | linux-6249d3232f222d454a4da3e6ac7efd01137f8400.tar.gz | |
cpu/hotplug: Make bringup/teardown of smp threads symmetric
commit c4de65696d865c225fda3b9913b31284ea65ea96 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 2f8f338e77cf5..7e811e2c32d28 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", |