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
This commit is contained in:
Linus Torvalds
2010-08-25 08:40:56 -07:00
4 changed files with 44 additions and 0 deletions

View File

@@ -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);