summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-25 08:40:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-25 08:40:56 -0700
commit5e686019df425a4fd8003ce7f6eaccbe537331d8 (patch)
treecc78762bc0fb471562ca1b5f745834a983020623 /kernel
parente09b4e9a8d15dce04bedf1b860abeec00de31aad (diff)
parentcd7240c0b900eb6d690ccee088a6c9b46dae815a (diff)
downloadlinux-5e686019df425a4fd8003ce7f6eaccbe537331d8.tar.gz
linux-5e686019df425a4fd8003ce7f6eaccbe537331d8.tar.bz2
linux-5e686019df425a4fd8003ce7f6eaccbe537331d8.zip
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, tsc, sched: Recompute cyc2ns_offset's during resume from sleep states sched: Fix rq->clock synchronization when migrating tasks
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 806d1b227a21..ab661ebc4895 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -3752,6 +3752,8 @@ static void task_fork_fair(struct task_struct *p)
raw_spin_lock_irqsave(&rq->lock, flags);
+ update_rq_clock(rq);
+
if (unlikely(task_cpu(p) != this_cpu))
__set_task_cpu(p, this_cpu);