[patch V3 16/32] powerpc/powernv: Use stop_machine_cpuslocked()

[Thomas Gleixner]

From: Sebastian Andrzej Siewior <bige...@linutronix.de>

set_subcores_per_core() holds get_online_cpus() while invoking stop_machine().

stop_machine() invokes get_online_cpus() as well. This is correct, but
prevents the conversion of the hotplug locking to a percpu rwsem.

Use stop_machine_cpuslocked() to avoid the nested call. Convert
*_online_cpus() to the new interfaces while at it.

Signed-off-by: Sebastian Andrzej Siewior <bige...@linutronix.de>
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org>
Cc: Steven Rostedt <rost...@goodmis.org>
Cc: Michael Ellerman <m...@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org

---
 arch/powerpc/platforms/powernv/subcore.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- a/arch/powerpc/platforms/powernv/subcore.c
+++ b/arch/powerpc/platforms/powernv/subcore.c
@@ -348,7 +348,7 @@ static int set_subcores_per_core(int new
                state->master = 0;
        }
 
-       get_online_cpus();
+       cpus_read_lock();
 
        /* This cpu will update the globals before exiting stop machine */
        this_cpu_ptr(&split_state)->master = 1;
@@ -356,9 +356,10 @@ static int set_subcores_per_core(int new
        /* Ensure state is consistent before we call the other cpus */
        mb();
 
-       stop_machine(cpu_update_split_mode, &new_mode, cpu_online_mask);
+       stop_machine_cpuslocked(cpu_update_split_mode, &new_mode,
+                               cpu_online_mask);
 
-       put_online_cpus();
+       cpus_read_unlock();
 
        return 0;
 }