| From foo@baz Tue Aug 14 16:14:56 CEST 2018 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Tue, 29 May 2018 17:49:05 +0200 |
| Subject: cpu/hotplug: Split do_cpu_down() |
| |
| From: Thomas Gleixner <tglx@linutronix.de> |
| |
| commit cc1fe215e1efa406b03aa4389e6269b61342dec5 upstream |
| |
| Split out the inner workings of do_cpu_down() to allow reuse of that |
| function for the upcoming SMT disabling mechanism. |
| |
| No functional change. |
| |
| 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: David Woodhouse <dwmw@amazon.co.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| kernel/cpu.c | 17 ++++++++--------- |
| 1 file changed, 8 insertions(+), 9 deletions(-) |
| |
| --- a/kernel/cpu.c |
| +++ b/kernel/cpu.c |
| @@ -955,20 +955,19 @@ out: |
| return ret; |
| } |
| |
| +static int cpu_down_maps_locked(unsigned int cpu, enum cpuhp_state target) |
| +{ |
| + if (cpu_hotplug_disabled) |
| + return -EBUSY; |
| + return _cpu_down(cpu, 0, target); |
| +} |
| + |
| static int do_cpu_down(unsigned int cpu, enum cpuhp_state target) |
| { |
| int err; |
| |
| cpu_maps_update_begin(); |
| - |
| - if (cpu_hotplug_disabled) { |
| - err = -EBUSY; |
| - goto out; |
| - } |
| - |
| - err = _cpu_down(cpu, 0, target); |
| - |
| -out: |
| + err = cpu_down_maps_locked(cpu, target); |
| cpu_maps_update_done(); |
| return err; |
| } |
