path: root/kernel/cpu.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-14 16:55:11 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-14 16:55:11 +0900
commitfe8a45df368038566c62bf311accf4319b210123 (patch)
treec39ab7df07ccf71eaeed742d3a575c269f992cbc /kernel/cpu.c
parent5e30025a319910695f5010dc0fb53a23299da14d (diff)
parent85b088e934b9943322bfe37077289ae60f1b3414 (diff)
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar: "Four bugfixes and one performance fix" * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/fair: Avoid integer overflow sched: Optimize task_sched_runtime() sched/numa: Cure update_numa_stats() vs. hotplug sched/numa: Fix NULL pointer dereference in task_numa_migrate() sched: Fix endless sync_sched/rcu() loop inside _cpu_down()
Diffstat (limited to 'kernel/cpu.c')
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 973d034acf84..deff2e693766 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -306,7 +306,6 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
__func__, cpu);
goto out_release;
- smpboot_park_threads(cpu);
* By now we've cleared cpu_active_mask, wait for all preempt-disabled
@@ -315,12 +314,16 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
* For CONFIG_PREEMPT we have preemptible RCU and its sync_rcu() might
* not imply sync_sched(), so explicitly call both.
+ *
+ * Do sync before park smpboot threads to take care the rcu boost case.
+ smpboot_park_threads(cpu);
* So now all preempt/rcu users must observe !cpu_active().

Privacy Policy