Merge tag 'locks-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...

[linux-2.6-microblaze.git] / kernel / cpu.c

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 191097c..dd8634d 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1274,7 +1274,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,
        },
@@ -2015,7 +2015,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)
 {
        per_cpu_ptr(&cpuhp_state, smp_processor_id())->state = CPUHP_ONLINE;
 }