summaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-08-02 14:11:26 +0200
committerIngo Molnar <mingo@elte.hu>2009-08-02 14:23:57 +0200
commit8e9ed8b02490fea577b1eb1704c05bf43c891ed7 (patch)
tree3c0cc5dd498abcf0cc894e85509c131a0dde9a43 /kernel/sched.c
parent716a42348cdaf04534b15fbdc9c83e25baebfed5 (diff)
parent07903af152b0597d94e9b0030746b63c4664e787 (diff)
downloadop-kernel-dev-8e9ed8b02490fea577b1eb1704c05bf43c891ed7.zip
op-kernel-dev-8e9ed8b02490fea577b1eb1704c05bf43c891ed7.tar.gz
Merge branch 'sched/urgent' into sched/core
Merge reason: avoid upcoming patch conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 953f037..ce1056e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -7318,6 +7318,7 @@ static void migrate_dead_tasks(unsigned int dead_cpu)
static void calc_global_load_remove(struct rq *rq)
{
atomic_long_sub(rq->calc_load_active, &calc_load_tasks);
+ rq->calc_load_active = 0;
}
#endif /* CONFIG_HOTPLUG_CPU */
@@ -7544,6 +7545,7 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
task_rq_unlock(rq, &flags);
get_task_struct(p);
cpu_rq(cpu)->migration_thread = p;
+ rq->calc_load_update = calc_load_update;
break;
case CPU_ONLINE:
@@ -7554,8 +7556,6 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
/* Update our root-domain */
rq = cpu_rq(cpu);
spin_lock_irqsave(&rq->lock, flags);
- rq->calc_load_update = calc_load_update;
- rq->calc_load_active = 0;
if (rq->rd) {
BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
OpenPOWER on IntegriCloud