diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-13 12:21:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-13 12:21:46 -0700 |
| commit | 1c594774283a7cfe6dc0f8ffdfb2dbfc497502c4 (patch) | |
| tree | 67e092bc8a058c7b4986aa582b87497a69e8bd64 /kernel | |
| parent | f7951c33f0fed14ee26651a70a46899a59a31e18 (diff) | |
| parent | d018031f562b9c2eff038969ab1955a370c52d8f (diff) | |
| download | linux-1c594774283a7cfe6dc0f8ffdfb2dbfc497502c4.tar.gz | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 15be70aae8ac..dd8634dde1ae 100644 --- 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, }, |