Commit 1c594774 authored Aug 13, 2018 by Linus Torvalds

Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

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

parents f7951c33 d018031f

kernel/cpu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,
		},