[PATCH] smp/hotplug: move step CPUHP_AP_SMPCFD_DYING to the correct place

[Lai Jiangshan]

31487f8328f2("smp/cfd: Convert core to hotplug state machine")
accidently put this step on the wrong place. The step should
be at the cpuhp_ap_states[] rather than the cpuhp_bp_states[].

grep smpcfd /sys/devices/system/cpu/hotplug/states
 40: smpcfd:prepare
129: smpcfd:dying

"smpcfd:dying" was missing before.
So was the invocation of the function smpcfd_dying_cpu().

Signed-off-by: Lai Jiangshan 
CC: Richard Weinberger 
cc: sta...@vger.kernel.org (v4.7+)
---
 kernel/cpu.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 04892a82f6ac..7891aecc6aec 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -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] = {
-- 
2.13.5 (Apple Git-94)

[PATCH] smp/hotplug: move step CPUHP_AP_SMPCFD_DYING to the correct place

[Lai Jiangshan]

31487f8328f2("smp/cfd: Convert core to hotplug state machine")
accidently put this step on the wrong place. The step should
be at the cpuhp_ap_states[] rather than the cpuhp_bp_states[].

grep smpcfd /sys/devices/system/cpu/hotplug/states
 40: smpcfd:prepare
129: smpcfd:dying

"smpcfd:dying" was missing before.
So was the invocation of the function smpcfd_dying_cpu().

Signed-off-by: Lai Jiangshan 
CC: Richard Weinberger 
cc: sta...@vger.kernel.org (v4.7+)
---
 kernel/cpu.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 04892a82f6ac..7891aecc6aec 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -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] = {
-- 
2.13.5 (Apple Git-94)