UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2018-08-13 12:21:46 -07:00
parent f7951c33f0 d018031f56
commit 1c59477428
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/cpu.c
View File

@ -1274,7 +1274,7 @@ static struct cpuhp_step cpuhp_hp_states[] = {
* otherwise a RCU stall occurs. * otherwise a RCU stall occurs.
*/ */
[CPUHP_TIMERS_PREPARE] = { [CPUHP_TIMERS_PREPARE] = {
.name = "timers:dead", .name = "timers:prepare",
.startup.single = timers_prepare_cpu, .startup.single = timers_prepare_cpu,
.teardown.single = timers_dead_cpu, .teardown.single = timers_dead_cpu,
}, },