cpu/hotplug: Cleanup state names

When the state names got added a script was used to add the extra argument
to the calls. The script basically converted the state constant to a
string, but the cleanup to convert these strings into meaningful ones did
not happen.

Replace all the useless strings with 'subsys/xxx/yyy:state' strings which
are used in all the other places already.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sebastian Siewior <bigeasy@linutronix.de>
Link: http://lkml.kernel.org/r/20161221192112.085444152@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

59 files changed, 77 insertions, 77 deletions

diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index 02d5e5e8d44c..895ae5197159 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -339,7 +339,7 @@ static int __init twd_local_timer_common_register(struct device_node *np)
         }
 
         cpuhp_setup_state_nocalls(CPUHP_AP_ARM_TWD_STARTING,
-                                  "AP_ARM_TWD_STARTING",
+                                  "arm/timer/twd:starting",
                                   twd_timer_starting_cpu, twd_timer_dying_cpu);
 
         twd_get_clock(np);
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
index ae2a018b9305..8f8748a0c84f 100644
--- a/arch/arm/mach-mvebu/coherency.c
+++ b/arch/arm/mach-mvebu/coherency.c
@@ -148,7 +148,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
         of_node_put(cpu_config_np);
 
         cpuhp_setup_state_nocalls(CPUHP_AP_ARM_MVEBU_COHERENCY,
-                                  "AP_ARM_MVEBU_COHERENCY",
+                                  "arm/mvebu/coherency:starting",
                                   armada_xp_clear_l2_starting, NULL);
 exit:
         set_cpu_coherent();
diff --git a/arch/arm/mm/cache-l2x0-pmu.c b/arch/arm/mm/cache-l2x0-pmu.c
index 976d3057272e..0a1e2280141f 100644
--- a/arch/arm/mm/cache-l2x0-pmu.c
+++ b/arch/arm/mm/cache-l2x0-pmu.c
@@ -563,7 +563,7 @@ static __init int l2x0_pmu_init(void)
 
         cpumask_set_cpu(0, &pmu_cpu);
         ret = cpuhp_setup_state_nocalls(CPUHP_AP_PERF_ARM_L2X0_ONLINE,
-                                        "AP_PERF_ARM_L2X0_ONLINE", NULL,
+                                        "perf/arm/l2x0:online", NULL,
                                         l2x0_pmu_offline_cpu);
         if (ret)
                 goto out_pmu;
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index d1870c777c6e..2290be390f87 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -683,7 +683,7 @@ static void __init l2c310_enable(void __iomem *base, unsigned num_lock)
 
         if (aux & L310_AUX_CTRL_FULL_LINE_ZERO)
                 cpuhp_setup_state(CPUHP_AP_ARM_L2X0_STARTING,
-                                  "AP_ARM_L2X0_STARTING", l2c310_starting_cpu,
+                                  "arm/l2x0:starting", l2c310_starting_cpu,
                                   l2c310_dying_cpu);
 }
 
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 0351f5645fb1..569d5a650a4a 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -799,7 +799,7 @@ static int __init vfp_init(void)
         }
 
         cpuhp_setup_state_nocalls(CPUHP_AP_ARM_VFP_STARTING,
-                                  "AP_ARM_VFP_STARTING", vfp_starting_cpu,
+                                  "arm/vfp:starting", vfp_starting_cpu,
                                   vfp_dying_cpu);
 
         vfp_vector = vfp_support_entry;
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 4986dc0c1dff..11d9f2898b16 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -412,7 +412,7 @@ static int __init xen_guest_init(void)
                 pvclock_gtod_register_notifier(&xen_pvclock_gtod_notifier);
 
         return cpuhp_setup_state(CPUHP_AP_ARM_XEN_STARTING,
-                                 "AP_ARM_XEN_STARTING", xen_starting_cpu,
+                                 "arm/xen:starting", xen_starting_cpu,
                                  xen_dying_cpu);
 }
 early_initcall(xen_guest_init);
diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c
index 04de188a36c9..a211addeb6bc 100644
--- a/arch/arm64/kernel/armv8_deprecated.c
+++ b/arch/arm64/kernel/armv8_deprecated.c
@@ -640,7 +640,7 @@ static int __init armv8_deprecated_init(void)
         }
 
         cpuhp_setup_state_nocalls(CPUHP_AP_ARM64_ISNDEP_STARTING,
-                                  "AP_ARM64_ISNDEP_STARTING",
+                                  "arm64/isndep:starting",
                                   run_all_insn_set_hw_mode, NULL);
         register_insn_emulation_sysctl(ctl_abi);
 
diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
index 605df76f0a06..2bd426448fc1 100644
--- a/arch/arm64/kernel/debug-monitors.c
+++ b/arch/arm64/kernel/debug-monitors.c
@@ -140,7 +140,7 @@ static int clear_os_lock(unsigned int cpu)
 static int debug_monitors_init(void)
 {
         return cpuhp_setup_state(CPUHP_AP_ARM64_DEBUG_MONITORS_STARTING,
-                                 "CPUHP_AP_ARM64_DEBUG_MONITORS_STARTING",
+                                 "arm64/debug_monitors:starting",
                                  clear_os_lock, NULL);
 }
 postcore_initcall(debug_monitors_init);
diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c
index 1b3c747fedda..0296e7924240 100644
--- a/arch/arm64/kernel/hw_breakpoint.c
+++ b/arch/arm64/kernel/hw_breakpoint.c
@@ -1001,7 +1001,7 @@ static int __init arch_hw_breakpoint_init(void)
          * debugger will leave the world in a nice state for us.
          */
         ret = cpuhp_setup_state(CPUHP_AP_PERF_ARM_HW_BREAKPOINT_STARTING,
-                          "CPUHP_AP_PERF_ARM_HW_BREAKPOINT_STARTING",
+                          "perf/arm64/hw_breakpoint:starting",
                           hw_breakpoint_reset, NULL);
         if (ret)
                 pr_err("failed to register CPU hotplug notifier: %d\n", ret);
diff --git a/arch/blackfin/kernel/perf_event.c b/arch/blackfin/kernel/perf_event.c
index 6355e97d22b9..6a9524ad04a5 100644
--- a/arch/blackfin/kernel/perf_event.c
+++ b/arch/blackfin/kernel/perf_event.c
@@ -475,7 +475,7 @@ static int __init bfin_pmu_init(void)
 
         ret = perf_pmu_register(&pmu, "cpu", PERF_TYPE_RAW);
         if (!ret)
-                cpuhp_setup_state(CPUHP_PERF_BFIN, "PERF_BFIN",
+                cpuhp_setup_state(CPUHP_PERF_BFIN,"perf/bfin:starting",
                                   bfin_pmu_prepare_cpu, NULL);
         return ret;
 }
diff --git a/arch/metag/kernel/perf/perf_event.c b/arch/metag/kernel/perf/perf_event.c
index 052cba23708c..7e793eb0c1fe 100644
--- a/arch/metag/kernel/perf/perf_event.c
+++ b/arch/metag/kernel/perf/perf_event.c
@@ -868,7 +868,7 @@ static int __init init_hw_perf_events(void)
         metag_out32(0, PERF_COUNT(1));
 
         cpuhp_setup_state(CPUHP_AP_PERF_METAG_STARTING,
-                          "AP_PERF_METAG_STARTING", metag_pmu_starting_cpu,
+                          "perf/metag:starting", metag_pmu_starting_cpu,
                           NULL);
 
         ret = perf_pmu_register(&pmu, metag_pmu->name, PERF_TYPE_RAW);
diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
index 7cf653e21423..5f928c34c148 100644
--- a/arch/mips/kernel/pm-cps.c
+++ b/arch/mips/kernel/pm-cps.c
@@ -713,7 +713,7 @@ static int __init cps_pm_init(void)
                 pr_warn("pm-cps: no CPC, clock & power gating unavailable\n");
         }
 
-        return cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "AP_PM_CPS_CPU_ONLINE",
+        return cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "mips/cps_pm:online",
                                  cps_pm_online_cpu, NULL);
 }
 arch_initcall(cps_pm_init);
diff --git a/arch/mips/oprofile/op_model_loongson3.c b/arch/mips/oprofile/op_model_loongson3.c
index 85f3ee4ab456..d60d97b6113d 100644
--- a/arch/mips/oprofile/op_model_loongson3.c
+++ b/arch/mips/oprofile/op_model_loongson3.c
@@ -186,7 +186,7 @@ static int __init loongson3_init(void)
 {
         on_each_cpu(reset_counters, NULL, 1);
         cpuhp_setup_state_nocalls(CPUHP_AP_MIPS_OP_LOONGSON3_STARTING,
-                                  "AP_MIPS_OP_LOONGSON3_STARTING",
+                                  "mips/oprofile/loongson3:starting",
                                   loongson3_starting_cpu, loongson3_dying_cpu);
         save_perf_irq = perf_irq;
         perf_irq = loongson3_perfcount_handler;
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 0cb6bd8bfccf..b1099cb2f393 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -944,7 +944,7 @@ void __init initmem_init(void)
          * _nocalls() + manual invocation is used because cpuhp is not yet
          * initialized for the boot CPU.
          */
-        cpuhp_setup_state_nocalls(CPUHP_POWER_NUMA_PREPARE, "POWER_NUMA_PREPARE",
+        cpuhp_setup_state_nocalls(CPUHP_POWER_NUMA_PREPARE, "powerpc/numa:prepare",
                                   ppc_numa_cpu_prepare, ppc_numa_cpu_dead);
         for_each_present_cpu(cpu)
                 numa_setup_cpu(cpu);
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index 72c27b8d2cf3..fd3e4034c04d 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -2189,7 +2189,7 @@ int register_power_pmu(struct power_pmu *pmu)
 #endif /* CONFIG_PPC64 */
 
         perf_pmu_register(&power_pmu, "cpu", PERF_TYPE_RAW);
-        cpuhp_setup_state(CPUHP_PERF_POWER, "PERF_POWER",
+        cpuhp_setup_state(CPUHP_PERF_POWER, "perf/powerpc:prepare",
                           power_pmu_prepare_cpu, NULL);
         return 0;
 }
diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index 037c2a253ae4..1aba10e90906 100644
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -711,7 +711,7 @@ static int __init cpumf_pmu_init(void)
                 return rc;
         }
         return cpuhp_setup_state(CPUHP_AP_PERF_S390_CF_ONLINE,
-                                 "AP_PERF_S390_CF_ONLINE",
+                                 "perf/s390/cf:online",
                                  s390_pmu_online_cpu, s390_pmu_offline_cpu);
 }
 early_initcall(cpumf_pmu_init);
diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
index 763dec18edcd..1c0b58545c04 100644
--- a/arch/s390/kernel/perf_cpum_sf.c
+++ b/arch/s390/kernel/perf_cpum_sf.c
@@ -1623,7 +1623,7 @@ static int __init init_cpum_sampling_pmu(void)
                 goto out;
         }
 
-        cpuhp_setup_state(CPUHP_AP_PERF_S390_SF_ONLINE, "AP_PERF_S390_SF_ONLINE",
+        cpuhp_setup_state(CPUHP_AP_PERF_S390_SF_ONLINE, "perf/s390/sf:online",
                           s390_pmu_sf_online_cpu, s390_pmu_sf_offline_cpu);
 out:
         return err;
diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c
index 40121d14d34d..10820f6cefbf 100644
--- a/arch/x86/entry/vdso/vma.c
+++ b/arch/x86/entry/vdso/vma.c
@@ -371,7 +371,7 @@ static int __init init_vdso(void)
 
         /* notifier priority > KVM */
         return cpuhp_setup_state(CPUHP_AP_X86_VDSO_VMA_ONLINE,
-                                 "AP_X86_VDSO_VMA_ONLINE", vgetcpu_online, NULL);
+                                 "x86/vdso/vma:online", vgetcpu_online, NULL);
 }
 subsys_initcall(init_vdso);
 #endif /* CONFIG_X86_64 */
diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c
index b26ee32f73e8..05612a2529c8 100644
--- a/arch/x86/events/amd/ibs.c
+++ b/arch/x86/events/amd/ibs.c
@@ -1010,7 +1010,7 @@ static __init int amd_ibs_init(void)
          * all online cpus.
          */
         cpuhp_setup_state(CPUHP_AP_PERF_X86_AMD_IBS_STARTING,
-                          "AP_PERF_X86_AMD_IBS_STARTING",
+                          "perf/x86/amd/ibs:STARTING",
                           x86_pmu_amd_ibs_starting_cpu,
                           x86_pmu_amd_ibs_dying_cpu);
 
diff --git a/arch/x86/events/amd/power.c b/arch/x86/events/amd/power.c
index 9842270ed2f2..a6eee5ac4f58 100644
--- a/arch/x86/events/amd/power.c
+++ b/arch/x86/events/amd/power.c
@@ -291,7 +291,7 @@ static int __init amd_power_pmu_init(void)
 
 
         cpuhp_setup_state(CPUHP_AP_PERF_X86_AMD_POWER_ONLINE,
-                          "AP_PERF_X86_AMD_POWER_ONLINE",
+                          "perf/x86/amd/power:online",
                           power_cpu_init, power_cpu_exit);
 
         ret = perf_pmu_register(&pmu_class, "power", -1);
diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c
index 65577f081d07..a0b1bdb3ad42 100644
--- a/arch/x86/events/amd/uncore.c
+++ b/arch/x86/events/amd/uncore.c
@@ -527,16 +527,16 @@ static int __init amd_uncore_init(void)
          * Install callbacks. Core will call them for each online cpu.
          */
         if (cpuhp_setup_state(CPUHP_PERF_X86_AMD_UNCORE_PREP,
-                              "PERF_X86_AMD_UNCORE_PREP",
+                              "perf/x86/amd/uncore:prepare",
                               amd_uncore_cpu_up_prepare, amd_uncore_cpu_dead))
                 goto fail_l2;
 
         if (cpuhp_setup_state(CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING,
-                              "AP_PERF_X86_AMD_UNCORE_STARTING",
+                              "perf/x86/amd/uncore:starting",
                               amd_uncore_cpu_starting, NULL))
                 goto fail_prep;
         if (cpuhp_setup_state(CPUHP_AP_PERF_X86_AMD_UNCORE_ONLINE,
-                              "AP_PERF_X86_AMD_UNCORE_ONLINE",
+                              "perf/x86/amd/uncore:online",
                               amd_uncore_cpu_online,
                               amd_uncore_cpu_down_prepare))
                 goto fail_start;
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index f1c22584a46f..019c5887b698 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -1820,18 +1820,18 @@ static int __init init_hw_perf_events(void)
          * Install callbacks. Core will call them for each online
          * cpu.
          */
-        err = cpuhp_setup_state(CPUHP_PERF_X86_PREPARE, "PERF_X86_PREPARE",
+        err = cpuhp_setup_state(CPUHP_PERF_X86_PREPARE, "perf/x86:prepare",
                                 x86_pmu_prepare_cpu, x86_pmu_dead_cpu);
         if (err)
                 return err;
 
         err = cpuhp_setup_state(CPUHP_AP_PERF_X86_STARTING,
-                                "AP_PERF_X86_STARTING", x86_pmu_starting_cpu,
+                                "perf/x86:starting", x86_pmu_starting_cpu,
                                 x86_pmu_dying_cpu);
         if (err)
                 goto out;
 
-        err = cpuhp_setup_state(CPUHP_AP_PERF_X86_ONLINE, "AP_PERF_X86_ONLINE",
+        err = cpuhp_setup_state(CPUHP_AP_PERF_X86_ONLINE, "perf/x86:online",
                                 x86_pmu_online_cpu, NULL);
         if (err)
                 goto out1;
diff --git a/arch/x86/events/intel/cqm.c b/arch/x86/events/intel/cqm.c
index 0c45cc8e64ba..8c00dc09a5d2 100644
--- a/arch/x86/events/intel/cqm.c
+++ b/arch/x86/events/intel/cqm.c
@@ -1747,9 +1747,9 @@ static int __init intel_cqm_init(void)
          * is enabled to avoid notifier leak.
          */
         cpuhp_setup_state(CPUHP_AP_PERF_X86_CQM_STARTING,
-                          "AP_PERF_X86_CQM_STARTING",
+                          "perf/x86/cqm:starting",
                           intel_cqm_cpu_starting, NULL);
-        cpuhp_setup_state(CPUHP_AP_PERF_X86_CQM_ONLINE, "AP_PERF_X86_CQM_ONLINE",
+        cpuhp_setup_state(CPUHP_AP_PERF_X86_CQM_ONLINE, "perf/x86/cqm:online",
                           NULL, intel_cqm_cpu_exit);
 
 out:
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 0a535cea8ff3..bd34124449b0 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -803,13 +803,13 @@ static int __init rapl_pmu_init(void)
          * Install callbacks. Core will call them for each online cpu.
          */
 
-        ret = cpuhp_setup_state(CPUHP_PERF_X86_RAPL_PREP, "PERF_X86_RAPL_PREP",
+        ret = cpuhp_setup_state(CPUHP_PERF_X86_RAPL_PREP, "perf/x86/rapl:prepare",
                                 rapl_cpu_prepare, NULL);
         if (ret)
                 goto out;
 
         ret = cpuhp_setup_state(CPUHP_AP_PERF_X86_RAPL_ONLINE,
-                                "AP_PERF_X86_RAPL_ONLINE",
+                                "perf/x86/rapl:online",
                                 rapl_cpu_online, rapl_cpu_offline);
         if (ret)
                 goto out1;
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index dbaaf7dc8373..97c246f84dea 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -1398,22 +1398,22 @@ static int __init intel_uncore_init(void)
          */
         if (!cret) {
                ret = cpuhp_setup_state(CPUHP_PERF_X86_UNCORE_PREP,
-                                        "PERF_X86_UNCORE_PREP",
-                                        uncore_cpu_prepare, NULL);
+                                       "perf/x86/intel/uncore:prepare",
+                                       uncore_cpu_prepare, NULL);
                 if (ret)
                         goto err;
         } else {
                 cpuhp_setup_state_nocalls(CPUHP_PERF_X86_UNCORE_PREP,
-                                          "PERF_X86_UNCORE_PREP",
+                                          "perf/x86/intel/uncore:prepare",
                                           uncore_cpu_prepare, NULL);
         }
         first_init = 1;
         cpuhp_setup_state(CPUHP_AP_PERF_X86_UNCORE_STARTING,
-                          "AP_PERF_X86_UNCORE_STARTING",
+                          "perf/x86/uncore:starting",
                           uncore_cpu_starting, uncore_cpu_dying);
         first_init = 0;
         cpuhp_setup_state(CPUHP_AP_PERF_X86_UNCORE_ONLINE,
-                          "AP_PERF_X86_UNCORE_ONLINE",
+                          "perf/x86/uncore:online",
                           uncore_event_cpu_online, uncore_event_cpu_offline);
         return 0;
 
diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index 456316f6c868..202a7817beaf 100644
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -234,7 +234,7 @@ static __init int apbt_late_init(void)
         if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT ||
                 !apb_timer_block_enabled)
                 return 0;
-        return cpuhp_setup_state(CPUHP_X86_APB_DEAD, "X86_APB_DEAD", NULL,
+        return cpuhp_setup_state(CPUHP_X86_APB_DEAD, "x86/apb:dead", NULL,
                                  apbt_cpu_dead);
 }
 fs_initcall(apbt_late_init);
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index 200af5ae9662..5a35f208ed95 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -191,7 +191,7 @@ static int x2apic_cluster_probe(void)
         if (!x2apic_mode)
                 return 0;
 
-        ret = cpuhp_setup_state(CPUHP_X2APIC_PREPARE, "X2APIC_PREPARE",
+        ret = cpuhp_setup_state(CPUHP_X2APIC_PREPARE, "x86/x2apic:prepare",
                                 x2apic_prepare_cpu, x2apic_dead_cpu);
         if (ret < 0) {
                 pr_err("Failed to register X2APIC_PREPARE\n");
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 274fab99169d..38c8fd684d38 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -1051,11 +1051,11 @@ static __init int hpet_late_init(void)
                 return 0;
 
         /* This notifier should be called after workqueue is ready */
-        ret = cpuhp_setup_state(CPUHP_AP_X86_HPET_ONLINE, "AP_X86_HPET_ONLINE",
+        ret = cpuhp_setup_state(CPUHP_AP_X86_HPET_ONLINE, "x86/hpet:online",
                                 hpet_cpuhp_online, NULL);
         if (ret)
                 return ret;
-        ret = cpuhp_setup_state(CPUHP_X86_HPET_DEAD, "X86_HPET_DEAD", NULL,
+        ret = cpuhp_setup_state(CPUHP_X86_HPET_DEAD, "x86/hpet:dead", NULL,
                                 hpet_cpuhp_dead);
         if (ret)
                 goto err_cpuhp;
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index 8402907825b0..b868fa1b812b 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -408,7 +408,7 @@ static __init int tboot_late_init(void)
         tboot_create_trampoline();
 
         atomic_set(&ap_wfs_count, 0);
-        cpuhp_setup_state(CPUHP_AP_X86_TBOOT_DYING, "AP_X86_TBOOT_DYING", NULL,
+        cpuhp_setup_state(CPUHP_AP_X86_TBOOT_DYING, "x86/tboot:dying", NULL,
                           tboot_dying_cpu);
 #ifdef CONFIG_DEBUG_FS
         debugfs_create_file("tboot_log", S_IRUSR,
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 445c51b6cf6d..6414fa6cb9fd 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5855,7 +5855,7 @@ static void kvm_timer_init(void)
         }
         pr_debug("kvm: max_tsc_khz = %ld\n", max_tsc_khz);
 
-        cpuhp_setup_state(CPUHP_AP_X86_KVM_CLK_ONLINE, "AP_X86_KVM_CLK_ONLINE",
+        cpuhp_setup_state(CPUHP_AP_X86_KVM_CLK_ONLINE, "x86/kvm/clk:online",
                           kvmclock_cpu_online, kvmclock_cpu_down_prep);
 }
 
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index ced7027b3fbc..51ef95232725 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1529,11 +1529,11 @@ static int xen_cpuhp_setup(void)
         int rc;
 
         rc = cpuhp_setup_state_nocalls(CPUHP_XEN_PREPARE,
-                                       "XEN_HVM_GUEST_PREPARE",
+                                       "x86/xen/hvm_guest:prepare",
                                        xen_cpu_up_prepare, xen_cpu_dead);
         if (rc >= 0) {
                 rc = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
-                                               "XEN_HVM_GUEST_ONLINE",
+                                               "x86/xen/hvm_guest:online",
                                                xen_cpu_up_online, NULL);
                 if (rc < 0)
                         cpuhp_remove_state_nocalls(CPUHP_XEN_PREPARE);
diff --git a/arch/xtensa/kernel/perf_event.c b/arch/xtensa/kernel/perf_event.c
index 0fecc8a2c0b5..ff1d81385ed7 100644
--- a/arch/xtensa/kernel/perf_event.c
+++ b/arch/xtensa/kernel/perf_event.c
@@ -422,7 +422,7 @@ static int __init xtensa_pmu_init(void)
         int irq = irq_create_mapping(NULL, XCHAL_PROFILING_INTERRUPT);
 
         ret = cpuhp_setup_state(CPUHP_AP_PERF_XTENSA_STARTING,
-                                "AP_PERF_XTENSA_STARTING", xtensa_pmu_setup,
+                                "perf/xtensa:starting", xtensa_pmu_setup,
                                 NULL);
         if (ret) {
                 pr_err("xtensa_pmu: failed to register CPU-hotplug.\n");
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index 231633328dfa..c49da15d9790 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -1796,7 +1796,7 @@ static int __init cci_platform_init(void)
         int ret;
 
         ret = cpuhp_setup_state_multi(CPUHP_AP_PERF_ARM_CCI_ONLINE,
-                                      "AP_PERF_ARM_CCI_ONLINE", NULL,
+                                      "perf/arm/cci:online", NULL,
                                       cci_pmu_offline_cpu);
         if (ret)
                 return ret;
diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c
index aee83462b796..4d6a2b7e4d3f 100644
--- a/drivers/bus/arm-ccn.c
+++ b/drivers/bus/arm-ccn.c
@@ -1562,7 +1562,7 @@ static int __init arm_ccn_init(void)
         int i, ret;
 
         ret = cpuhp_setup_state_multi(CPUHP_AP_PERF_ARM_CCN_ONLINE,
-                                      "AP_PERF_ARM_CCN_ONLINE", NULL,
+                                      "perf/arm/ccn:online", NULL,
                                       arm_ccn_pmu_offline_cpu);
         if (ret)
                 return ret;
diff --git a/drivers/clocksource/arc_timer.c b/drivers/clocksource/arc_timer.c
index a49748d826c0..2b7e87134d1a 100644
--- a/drivers/clocksource/arc_timer.c
+++ b/drivers/clocksource/arc_timer.c
@@ -309,7 +309,7 @@ static int __init arc_clockevent_setup(struct device_node *node)
         }
 
         ret = cpuhp_setup_state(CPUHP_AP_ARC_TIMER_STARTING,
-                                "AP_ARC_TIMER_STARTING",
+                                "clockevents/arc/timer:starting",
                                 arc_timer_starting_cpu,
                                 arc_timer_dying_cpu);
         if (ret) {
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 02fef6830e72..cdeca850f29e 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -738,7 +738,7 @@ static int __init arch_timer_register(void)
 
         /* Register and immediately configure the timer on the boot CPU */
         err = cpuhp_setup_state(CPUHP_AP_ARM_ARCH_TIMER_STARTING,
-                                "AP_ARM_ARCH_TIMER_STARTING",
+                                "clockevents/arm/arch_timer:starting",
                                 arch_timer_starting_cpu, arch_timer_dying_cpu);
         if (err)
                 goto out_unreg_cpupm;
diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c
index 8da03298f844..bbfeb2800a94 100644
--- a/drivers/clocksource/arm_global_timer.c
+++ b/drivers/clocksource/arm_global_timer.c
@@ -316,7 +316,7 @@ static int __init global_timer_of_register(struct device_node *np)
                 goto out_irq;
         
         err = cpuhp_setup_state(CPUHP_AP_ARM_GLOBAL_TIMER_STARTING,
-                                "AP_ARM_GLOBAL_TIMER_STARTING",
+                                "clockevents/arm/global_timer:starting",
                                 gt_starting_cpu, gt_dying_cpu);
         if (err)
                 goto out_irq;
diff --git a/drivers/clocksource/dummy_timer.c b/drivers/clocksource/dummy_timer.c
index 89f1c2edbe02..01f3f5a59bc6 100644
--- a/drivers/clocksource/dummy_timer.c
+++ b/drivers/clocksource/dummy_timer.c
@@ -34,7 +34,7 @@ static int dummy_timer_starting_cpu(unsigned int cpu)
 static int __init dummy_timer_register(void)
 {
         return cpuhp_setup_state(CPUHP_AP_DUMMY_TIMER_STARTING,
-                                 "AP_DUMMY_TIMER_STARTING",
+                                 "clockevents/dummy_timer:starting",
                                  dummy_timer_starting_cpu, NULL);
 }
 early_initcall(dummy_timer_register);
diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c
index 8f3488b80896..b45b72b95861 100644
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
@@ -552,7 +552,7 @@ static int __init exynos4_timer_resources(struct device_node *np, void __iomem *
 
         /* Install hotplug callbacks which configure the timer on this CPU */
         err = cpuhp_setup_state(CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,
-                                "AP_EXYNOS4_MCT_TIMER_STARTING",
+                                "clockevents/exynos4/mct_timer:starting",
                                 exynos4_mct_starting_cpu,
                                 exynos4_mct_dying_cpu);
         if (err)
diff --git a/drivers/clocksource/jcore-pit.c b/drivers/clocksource/jcore-pit.c
index 54e1665aa03c..4e4146f69845 100644
--- a/drivers/clocksource/jcore-pit.c
+++ b/drivers/clocksource/jcore-pit.c
@@ -240,7 +240,7 @@ static int __init jcore_pit_init(struct device_node *node)
         }
 
         cpuhp_setup_state(CPUHP_AP_JCORE_TIMER_STARTING,
-                          "AP_JCORE_TIMER_STARTING",
+                          "clockevents/jcore:starting",
                           jcore_pit_local_init, NULL);
 
         return 0;
diff --git a/drivers/clocksource/metag_generic.c b/drivers/clocksource/metag_generic.c
index a80ab3e446b7..172f43d4bc1a 100644
--- a/drivers/clocksource/metag_generic.c
+++ b/drivers/clocksource/metag_generic.c
@@ -154,6 +154,6 @@ int __init metag_generic_timer_init(void)
 
         /* Hook cpu boot to configure the CPU's timers */
         return cpuhp_setup_state(CPUHP_AP_METAG_TIMER_STARTING,
-                                 "AP_METAG_TIMER_STARTING",
+                                 "clockevents/metag:starting",
                                  arch_timer_starting_cpu, NULL);
 }
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 7a960cd01104..d9278847ffb2 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -120,8 +120,8 @@ static int gic_clockevent_init(void)
         }
 
         cpuhp_setup_state(CPUHP_AP_MIPS_GIC_TIMER_STARTING,
-                          "AP_MIPS_GIC_TIMER_STARTING", gic_starting_cpu,
-                          gic_dying_cpu);
+                          "clockevents/mips/gic/timer:starting",
+                          gic_starting_cpu, gic_dying_cpu);
         return 0;
 }
 
diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c
index 3283cfa2aa52..3bf65fff5c08 100644
--- a/drivers/clocksource/qcom-timer.c
+++ b/drivers/clocksource/qcom-timer.c
@@ -182,7 +182,7 @@ static int __init msm_timer_init(u32 dgt_hz, int sched_bits, int irq,
         } else {
                 /* Install and invoke hotplug callbacks */
                 res = cpuhp_setup_state(CPUHP_AP_QCOM_TIMER_STARTING,
-                                        "AP_QCOM_TIMER_STARTING",
+                                        "clockevents/qcom/timer:starting",
                                         msm_local_timer_starting_cpu,
                                         msm_local_timer_dying_cpu);
                 if (res) {
diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index 3c39e6f45971..4440aefc59cd 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -320,7 +320,7 @@ static int __init armada_370_xp_timer_common_init(struct device_node *np)
         }
 
         res = cpuhp_setup_state(CPUHP_AP_ARMADA_TIMER_STARTING,
-                                "AP_ARMADA_TIMER_STARTING",
+                                "clockevents/armada:starting",
                                 armada_370_xp_timer_starting_cpu,
                                 armada_370_xp_timer_dying_cpu);
         if (res) {
diff --git a/drivers/clocksource/timer-atlas7.c b/drivers/clocksource/timer-atlas7.c
index 4334e0330ada..3c23e1744f4a 100644
--- a/drivers/clocksource/timer-atlas7.c
+++ b/drivers/clocksource/timer-atlas7.c
@@ -221,7 +221,7 @@ static int __init sirfsoc_clockevent_init(void)
 
         /* Install and invoke hotplug callbacks */
         return cpuhp_setup_state(CPUHP_AP_MARCO_TIMER_STARTING,
-                                 "AP_MARCO_TIMER_STARTING",
+                                 "clockevents/marco:starting",
                                  sirfsoc_local_timer_starting_cpu,
                                  sirfsoc_local_timer_dying_cpu);
 }
diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c
index 3fe368b23d15..a51b6b64ecdf 100644
--- a/drivers/hwtracing/coresight/coresight-etm3x.c
+++ b/drivers/hwtracing/coresight/coresight-etm3x.c
@@ -804,10 +804,10 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id)
 
         if (!etm_count++) {
                 cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING,
-                                          "AP_ARM_CORESIGHT_STARTING",
+                                          "arm/coresight:starting",
                                           etm_starting_cpu, etm_dying_cpu);
                 ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
-                                                "AP_ARM_CORESIGHT_ONLINE",
+                                                "arm/coresight:online",
                                                 etm_online_cpu, NULL);
                 if (ret < 0)
                         goto err_arch_supported;
diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
index 4db8d6a4d0cb..5edc63fbb06f 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x.c
@@ -987,10 +987,10 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
 
         if (!etm4_count++) {
                 cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CORESIGHT4_STARTING,
-                                          "AP_ARM_CORESIGHT4_STARTING",
+                                          "arm/coresight4:starting",
                                           etm4_starting_cpu, etm4_dying_cpu);
                 ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
-                                                "AP_ARM_CORESIGHT4_ONLINE",
+                                                "arm/coresight4:online",
                                                 etm4_online_cpu, NULL);
                 if (ret < 0)
                         goto err_arch_supported;
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 8bcee65a0b8c..9d9c2c45916a 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -578,13 +578,13 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node,
 #ifdef CONFIG_SMP
                 set_smp_cross_call(armada_mpic_send_doorbell);
                 cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_ARMADA_XP_STARTING,
-                                          "AP_IRQ_ARMADA_XP_STARTING",
+                                          "irqchip/armada/ipi:starting",
                                           armada_xp_mpic_starting_cpu, NULL);
 #endif
         } else {
 #ifdef CONFIG_SMP
                 cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_ARMADA_CASC_STARTING,
-                                          "AP_IRQ_ARMADA_CASC_STARTING",
+                                          "irqchip/armada/cascade:starting",
                                           mpic_cascaded_starting_cpu, NULL);
 #endif
                 irq_set_chained_handler(parent_irq,
diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c
index d96b2c947e74..e7463e3c0814 100644
--- a/drivers/irqchip/irq-bcm2836.c
+++ b/drivers/irqchip/irq-bcm2836.c
@@ -245,7 +245,7 @@ bcm2836_arm_irqchip_smp_init(void)
 #ifdef CONFIG_SMP
         /* Unmask IPIs to the boot CPU. */
         cpuhp_setup_state(CPUHP_AP_IRQ_BCM2836_STARTING,
-                          "AP_IRQ_BCM2836_STARTING", bcm2836_cpu_starting,
+                          "irqchip/bcm2836:starting", bcm2836_cpu_starting,
                           bcm2836_cpu_dying);
 
         set_smp_cross_call(bcm2836_arm_irqchip_send_ipi);
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 26e1d7fafb1e..d696de1a29fb 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -633,8 +633,8 @@ static void gic_smp_init(void)
 {
         set_smp_cross_call(gic_raise_softirq);
         cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GICV3_STARTING,
-                                  "AP_IRQ_GICV3_STARTING", gic_starting_cpu,
-                                  NULL);
+                                  "irqchip/arm/gicv3:starting",
+                                  gic_starting_cpu, NULL);
 }
 
 static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index d6c404b3584d..1b1df4f770bd 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -1191,7 +1191,7 @@ static int __init __gic_init_bases(struct gic_chip_data *gic,
                 set_smp_cross_call(gic_raise_softirq);
 #endif
                 cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GIC_STARTING,
-                                          "AP_IRQ_GIC_STARTING",
+                                          "irqchip/arm/gic:starting",
                                           gic_starting_cpu, NULL);
                 set_handle_irq(gic_handle_irq);
                 if (static_key_true(&supports_deactivate))
diff --git a/drivers/irqchip/irq-hip04.c b/drivers/irqchip/irq-hip04.c
index 021b0e0833c1..c1b4ee955dbe 100644
--- a/drivers/irqchip/irq-hip04.c
+++ b/drivers/irqchip/irq-hip04.c
@@ -407,7 +407,7 @@ hip04_of_init(struct device_node *node, struct device_node *parent)
         set_handle_irq(hip04_handle_irq);
 
         hip04_irq_dist_init(&hip04_data);
-        cpuhp_setup_state(CPUHP_AP_IRQ_HIP04_STARTING, "AP_IRQ_HIP04_STARTING",
+        cpuhp_setup_state(CPUHP_AP_IRQ_HIP04_STARTING, "irqchip/hip04:starting",
                           hip04_irq_starting_cpu, NULL);
         return 0;
 }
diff --git a/drivers/leds/trigger/ledtrig-cpu.c b/drivers/leds/trigger/ledtrig-cpu.c
index 9719caf7437c..a41896468cb3 100644
--- a/drivers/leds/trigger/ledtrig-cpu.c
+++ b/drivers/leds/trigger/ledtrig-cpu.c
@@ -127,7 +127,7 @@ static int __init ledtrig_cpu_init(void)
 
         register_syscore_ops(&ledtrig_cpu_syscore_ops);
 
-        ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "AP_LEDTRIG_STARTING",
+        ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "leds/trigger:starting",
                                 ledtrig_online_cpu, ledtrig_prepare_down_cpu);
         if (ret < 0)
                 pr_err("CPU hotplug notifier for ledtrig-cpu could not be registered: %d\n",
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 5deeda61d6d3..4a105006ca63 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2484,13 +2484,13 @@ static __init int virtio_net_driver_init(void)
 {
         int ret;
 
-        ret = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN, "AP_VIRT_NET_ONLINE",
+        ret = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN, "virtio/net:online",
                                       virtnet_cpu_online,
                                       virtnet_cpu_down_prep);
         if (ret < 0)
                 goto out;
         virtionet_online = ret;
-        ret = cpuhp_setup_state_multi(CPUHP_VIRT_NET_DEAD, "VIRT_NET_DEAD",
+        ret = cpuhp_setup_state_multi(CPUHP_VIRT_NET_DEAD, "virtio/net:dead",
                                       NULL, virtnet_cpu_dead);
         if (ret)
                 goto err_dead;
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index b37b57294566..6d9335865880 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -1084,7 +1084,7 @@ static int arm_pmu_hp_init(void)
         int ret;
 
         ret = cpuhp_setup_state_multi(CPUHP_AP_PERF_ARM_STARTING,
-                                      "AP_PERF_ARM_STARTING",
+                                      "perf/arm/pmu:starting",
                                       arm_perf_starting_cpu, NULL);
         if (ret)
                 pr_err("CPU hotplug notifier for ARM PMU could not be registered: %d\n",
diff --git a/drivers/xen/events/events_fifo.c b/drivers/xen/events/events_fifo.c
index 7ef27c6ed72f..c03f9c86c7e3 100644
--- a/drivers/xen/events/events_fifo.c
+++ b/drivers/xen/events/events_fifo.c
@@ -445,7 +445,7 @@ int __init xen_evtchn_fifo_init(void)
         evtchn_ops = &evtchn_ops_fifo;
 
         cpuhp_setup_state_nocalls(CPUHP_XEN_EVTCHN_PREPARE,
-                                  "CPUHP_XEN_EVTCHN_PREPARE",
+                                  "xen/evtchn:prepare",
                                   xen_evtchn_cpu_prepare, xen_evtchn_cpu_dead);
 out:
         put_cpu();
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index ae95fc0e3214..5b4f60d43314 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -456,7 +456,7 @@ int kvm_timer_hyp_init(void)
         kvm_info("virtual timer IRQ%d\n", host_vtimer_irq);
 
         cpuhp_setup_state(CPUHP_AP_KVM_ARM_TIMER_STARTING,
-                          "AP_KVM_ARM_TIMER_STARTING", kvm_timer_starting_cpu,
+                          "kvm/arm/timer:starting", kvm_timer_starting_cpu,
                           kvm_timer_dying_cpu);
         return err;
 }
diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c
index 8cebfbc19e90..5114391b7e5a 100644
--- a/virt/kvm/arm/vgic/vgic-init.c
+++ b/virt/kvm/arm/vgic/vgic-init.c
@@ -428,7 +428,7 @@ int kvm_vgic_hyp_init(void)
         }
 
         ret = cpuhp_setup_state(CPUHP_AP_KVM_ARM_VGIC_INIT_STARTING,
-                                "AP_KVM_ARM_VGIC_INIT_STARTING",
+                                "kvm/arm/vgic:starting",
                                 vgic_init_cpu_starting, vgic_init_cpu_dying);
         if (ret) {
                 kvm_err("Cannot register vgic CPU notifier\n");
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index de102cae7125..ec298b7ca556 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3944,7 +3944,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
                         goto out_free_1;
         }
 
-        r = cpuhp_setup_state_nocalls(CPUHP_AP_KVM_STARTING, "AP_KVM_STARTING",
+        r = cpuhp_setup_state_nocalls(CPUHP_AP_KVM_STARTING, "kvm/cpu:starting",
                                       kvm_starting_cpu, kvm_dying_cpu);
         if (r)
                 goto out_free_2;