Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull CPU hotplug fix from Ingo Molnar: "A single fix moving the smp-call queue flush step to the intended point in the state machine" * 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: smp/hotplug: Move step CPUHP_AP_SMPCFD_DYING to the correct place
This commit is contained in:
commit
4b43a3bc20
1 changed files with 5 additions and 5 deletions
10
kernel/cpu.c
10
kernel/cpu.c
|
@ -1289,11 +1289,6 @@ static struct cpuhp_step cpuhp_bp_states[] = {
|
|||
.teardown.single = NULL,
|
||||
.cant_stop = true,
|
||||
},
|
||||
[CPUHP_AP_SMPCFD_DYING] = {
|
||||
.name = "smpcfd:dying",
|
||||
.startup.single = NULL,
|
||||
.teardown.single = smpcfd_dying_cpu,
|
||||
},
|
||||
/*
|
||||
* Handled on controll processor until the plugged processor manages
|
||||
* this itself.
|
||||
|
@ -1335,6 +1330,11 @@ static struct cpuhp_step cpuhp_ap_states[] = {
|
|||
.startup.single = NULL,
|
||||
.teardown.single = rcutree_dying_cpu,
|
||||
},
|
||||
[CPUHP_AP_SMPCFD_DYING] = {
|
||||
.name = "smpcfd:dying",
|
||||
.startup.single = NULL,
|
||||
.teardown.single = smpcfd_dying_cpu,
|
||||
},
|
||||
/* Entry state on starting. Interrupts enabled from here on. Transient
|
||||
* state for synchronsization */
|
||||
[CPUHP_AP_ONLINE] = {
|
||||
|
|
Loading…
Reference in a new issue