Merge 4.15-rc3 into char-misc-next

We want the fixes and changes in here for testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 04892a82f6ac..41376c3ac93b 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -780,8 +780,8 @@ static int takedown_cpu(unsigned int cpu)
         BUG_ON(cpu_online(cpu));
 
         /*
-         * The CPUHP_AP_SCHED_MIGRATE_DYING callback will have removed all
-         * runnable tasks from the cpu, there's only the idle task left now
+         * The teardown callback for CPUHP_AP_SCHED_STARTING will have removed
+         * all runnable tasks from the CPU, there's only the idle task left now
          * that the migration thread is done doing the stop_machine thing.
          *
          * Wait for the stop thread to go away.
@@ -1289,11 +1289,6 @@ static struct cpuhp_step cpuhp_bp_states[] = {
                 .teardown.single        = NULL,
                 .cant_stop              = true,
         },
-        [CPUHP_AP_SMPCFD_DYING] = {
-                .name                   = "smpcfd:dying",
-                .startup.single         = NULL,
-                .teardown.single        = smpcfd_dying_cpu,
-        },
         /*
          * Handled on controll processor until the plugged processor manages
          * this itself.
@@ -1335,6 +1330,11 @@ static struct cpuhp_step cpuhp_ap_states[] = {
                 .startup.single         = NULL,
                 .teardown.single        = rcutree_dying_cpu,
         },
+        [CPUHP_AP_SMPCFD_DYING] = {
+                .name                   = "smpcfd:dying",
+                .startup.single         = NULL,
+                .teardown.single        = smpcfd_dying_cpu,
+        },
         /* Entry state on starting. Interrupts enabled from here on. Transient
          * state for synchronsization */
         [CPUHP_AP_ONLINE] = {