Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Aug 2018 19:21:46 +0000 (12:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Aug 2018 19:21:46 +0000 (12:21 -0700)
Pull CPU hotplug update from Thomas Gleixner:
 "A trivial name fix for the hotplug state machine"

* 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu/hotplug: Clarify CPU hotplug step name for timers

1  2 
kernel/cpu.c

diff --combined kernel/cpu.c
index 15be70aae8acca66a785ec2ab71cd2d06f5bb3dc,8e6606ac3d728863dc15d3f69ad6408de1d14dc3..dd8634dde1ae683d117c7f35f88ccdcdf34df79c
@@@ -1274,7 -1274,7 +1274,7 @@@ static struct cpuhp_step cpuhp_hp_state
         * otherwise a RCU stall occurs.
         */
        [CPUHP_TIMERS_PREPARE] = {
-               .name                   = "timers:dead",
+               .name                   = "timers:prepare",
                .startup.single         = timers_prepare_cpu,
                .teardown.single        = timers_dead_cpu,
        },
                .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,
@@@ -2015,7 -2010,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;
  }