2 files changed, 7 insertions, 2 deletions

diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index 22acee76cf4c..2ab7bf53d529 100644
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -101,7 +101,6 @@ enum cpuhp_state {
         CPUHP_AP_ARM_L2X0_STARTING,
         CPUHP_AP_ARM_ARCH_TIMER_STARTING,
         CPUHP_AP_ARM_GLOBAL_TIMER_STARTING,
-        CPUHP_AP_DUMMY_TIMER_STARTING,
         CPUHP_AP_JCORE_TIMER_STARTING,
         CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,
         CPUHP_AP_ARM_TWD_STARTING,
@@ -115,6 +114,8 @@ enum cpuhp_state {
         CPUHP_AP_KVM_ARM_VGIC_INIT_STARTING,
         CPUHP_AP_KVM_ARM_VGIC_STARTING,
         CPUHP_AP_KVM_ARM_TIMER_STARTING,
+        /* Must be the last timer callback */
+        CPUHP_AP_DUMMY_TIMER_STARTING,
         CPUHP_AP_ARM_XEN_STARTING,
         CPUHP_AP_ARM_CORESIGHT_STARTING,
         CPUHP_AP_ARM_CORESIGHT4_STARTING,
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 217fd2e7f435..5339aca811d2 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1586,7 +1586,11 @@ EXPORT_SYMBOL_GPL(__cpuhp_state_add_instance);
  * @startup:    startup callback function
  * @teardown:   teardown callback function
  *
- * Returns 0 if successful, otherwise a proper error code
+ * Returns:
+ *   On success:
+ *      Positive state number if @state is CPUHP_AP_ONLINE_DYN
+ *      0 for all other states
+ *   On failure: proper (negative) error code
  */
 int __cpuhp_setup_state(enum cpuhp_state state,
                         const char *name, bool invoke,