summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2010-08-19 13:31:43 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-20 13:18:09 -0700
commit6c55d19c1d235c267b151d1d6e55a9d6fd5b5161 (patch)
tree0a48556a70900062798662ee756ae9b36f8ded50 /kernel
parentbea226b8e646ddb0bd262fc666b741134b9e9612 (diff)
sched: Fix rq->clock synchronization when migrating tasks
commit 861d034ee814917a83bd5de4b26e3b8336ddeeb8 upstream sched_fork() -- we do task placement in ->task_fork_fair() ensure we update_rq_clock() so we work with current time. We leave the vruntime in relative state, so the time delay until wake_up_new_task() doesn't matter. wake_up_new_task() -- Since task_fork_fair() left p->vruntime in relative state we can safely migrate, the activate_task() on the remote rq will call update_rq_clock() and causes the clock to be synced (enough). Tested-by: Jack Daniel <wanders.thirst@gmail.com> Tested-by: Philby John <pjohn@mvista.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <1281002322.1923.1708.camel@laptop> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Mike Galbraith <efault@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched_fair.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index ee89be8571b1..be3450816f9e 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1963,6 +1963,8 @@ static void task_fork_fair(struct task_struct *p)
spin_lock_irqsave(&rq->lock, flags);
+ update_rq_clock(rq);
+
if (unlikely(task_cpu(p) != this_cpu))
__set_task_cpu(p, this_cpu);