diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-06 10:13:48 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-06 10:20:28 -0400 |
commit | 677f6646533d701c8609b8bcb9304173c11cc194 (patch) | |
tree | 9063b3328346585a9722fe6704d98f89c4c88ff1 | |
parent | 3c1627e999e45e292d5d7ea3751ed86a6383ee2c (diff) |
cpu/hotplug: Make state names consistent
We should have all names in the scheme "[subsys/]facility:state]". Fix the
core to comply.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | kernel/cpu.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 2409ed717a3f..32eef273a0b9 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
@@ -1261,7 +1261,7 @@ static struct cpuhp_step cpuhp_bp_states[] = { | |||
1261 | }, | 1261 | }, |
1262 | #ifdef CONFIG_SMP | 1262 | #ifdef CONFIG_SMP |
1263 | [CPUHP_CREATE_THREADS]= { | 1263 | [CPUHP_CREATE_THREADS]= { |
1264 | .name = "threads:create", | 1264 | .name = "threads:prepare", |
1265 | .startup.single = smpboot_create_threads, | 1265 | .startup.single = smpboot_create_threads, |
1266 | .teardown.single = NULL, | 1266 | .teardown.single = NULL, |
1267 | .cant_stop = true, | 1267 | .cant_stop = true, |
@@ -1282,12 +1282,12 @@ static struct cpuhp_step cpuhp_bp_states[] = { | |||
1282 | .teardown.single = hrtimers_dead_cpu, | 1282 | .teardown.single = hrtimers_dead_cpu, |
1283 | }, | 1283 | }, |
1284 | [CPUHP_SMPCFD_PREPARE] = { | 1284 | [CPUHP_SMPCFD_PREPARE] = { |
1285 | .name = "SMPCFD:prepare", | 1285 | .name = "smpcfd:prepare", |
1286 | .startup.single = smpcfd_prepare_cpu, | 1286 | .startup.single = smpcfd_prepare_cpu, |
1287 | .teardown.single = smpcfd_dead_cpu, | 1287 | .teardown.single = smpcfd_dead_cpu, |
1288 | }, | 1288 | }, |
1289 | [CPUHP_RCUTREE_PREP] = { | 1289 | [CPUHP_RCUTREE_PREP] = { |
1290 | .name = "RCU-tree:prepare", | 1290 | .name = "RCU/tree:prepare", |
1291 | .startup.single = rcutree_prepare_cpu, | 1291 | .startup.single = rcutree_prepare_cpu, |
1292 | .teardown.single = rcutree_dead_cpu, | 1292 | .teardown.single = rcutree_dead_cpu, |
1293 | }, | 1293 | }, |
@@ -1320,7 +1320,7 @@ static struct cpuhp_step cpuhp_bp_states[] = { | |||
1320 | .cant_stop = true, | 1320 | .cant_stop = true, |
1321 | }, | 1321 | }, |
1322 | [CPUHP_AP_SMPCFD_DYING] = { | 1322 | [CPUHP_AP_SMPCFD_DYING] = { |
1323 | .name = "SMPCFD:dying", | 1323 | .name = "smpcfd:dying", |
1324 | .startup.single = NULL, | 1324 | .startup.single = NULL, |
1325 | .teardown.single = smpcfd_dying_cpu, | 1325 | .teardown.single = smpcfd_dying_cpu, |
1326 | }, | 1326 | }, |
@@ -1361,7 +1361,7 @@ static struct cpuhp_step cpuhp_ap_states[] = { | |||
1361 | .teardown.single = sched_cpu_dying, | 1361 | .teardown.single = sched_cpu_dying, |
1362 | }, | 1362 | }, |
1363 | [CPUHP_AP_RCUTREE_DYING] = { | 1363 | [CPUHP_AP_RCUTREE_DYING] = { |
1364 | .name = "RCU-tree:dying", | 1364 | .name = "RCU/tree:dying", |
1365 | .startup.single = NULL, | 1365 | .startup.single = NULL, |
1366 | .teardown.single = rcutree_dying_cpu, | 1366 | .teardown.single = rcutree_dying_cpu, |
1367 | }, | 1367 | }, |
@@ -1384,7 +1384,7 @@ static struct cpuhp_step cpuhp_ap_states[] = { | |||
1384 | }, | 1384 | }, |
1385 | /* Handle smpboot threads park/unpark */ | 1385 | /* Handle smpboot threads park/unpark */ |
1386 | [CPUHP_AP_SMPBOOT_THREADS] = { | 1386 | [CPUHP_AP_SMPBOOT_THREADS] = { |
1387 | .name = "smpboot:threads", | 1387 | .name = "smpboot/threads:online", |
1388 | .startup.single = smpboot_unpark_threads, | 1388 | .startup.single = smpboot_unpark_threads, |
1389 | .teardown.single = NULL, | 1389 | .teardown.single = NULL, |
1390 | }, | 1390 | }, |
@@ -1399,7 +1399,7 @@ static struct cpuhp_step cpuhp_ap_states[] = { | |||
1399 | .teardown.single = workqueue_offline_cpu, | 1399 | .teardown.single = workqueue_offline_cpu, |
1400 | }, | 1400 | }, |
1401 | [CPUHP_AP_RCUTREE_ONLINE] = { | 1401 | [CPUHP_AP_RCUTREE_ONLINE] = { |
1402 | .name = "RCU-tree:online", | 1402 | .name = "RCU/tree:online", |
1403 | .startup.single = rcutree_online_cpu, | 1403 | .startup.single = rcutree_online_cpu, |
1404 | .teardown.single = rcutree_offline_cpu, | 1404 | .teardown.single = rcutree_offline_cpu, |
1405 | }, | 1405 | }, |