X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=kernel%2Fcpu.c;fp=kernel%2Fcpu.c;h=099fb20cd7be9d39d6f3000d528b5c23c0d113e5;hb=958f338e96f874a0d29442396d6adf9c1e17aa2d;hp=9d2512dd263c2cdb8c7048c8372d7fa7a9891020;hpb=07d981ad4cf1e78361c6db1c28ee5ba105f96cc1;p=linux

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 9d2512dd263c..099fb20cd7be 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1367,7 +1367,7 @@ static struct cpuhp_step cpuhp_hp_states[] = {
 	 * otherwise a RCU stall occurs.
 	 */
 	[CPUHP_TIMERS_PREPARE] = {
-		.name			= "timers:dead",
+		.name			= "timers:prepare",
 		.startup.single		= timers_prepare_cpu,
 		.teardown.single	= timers_dead_cpu,
 	},
@@ -1437,6 +1437,11 @@ static struct cpuhp_step cpuhp_hp_states[] = {
 		.startup.single		= perf_event_init_cpu,
 		.teardown.single	= perf_event_exit_cpu,
 	},
+	[CPUHP_AP_WATCHDOG_ONLINE] = {
+		.name			= "lockup_detector:online",
+		.startup.single		= lockup_detector_online_cpu,
+		.teardown.single	= lockup_detector_offline_cpu,
+	},
 	[CPUHP_AP_WORKQUEUE_ONLINE] = {
 		.name			= "workqueue:online",
 		.startup.single		= workqueue_online_cpu,
@@ -2265,7 +2270,7 @@ void __init boot_cpu_init(void)
 /*
  * Must be called _AFTER_ setting up the per_cpu areas
  */
-void __init boot_cpu_state_init(void)
+void __init boot_cpu_hotplug_init(void)
 {
 	this_cpu_write(cpuhp_state.booted_once, true);
 	this_cpu_write(cpuhp_state.state, CPUHP_ONLINE);