diff --git a/[refs] b/[refs] index 1380e1b9299b..9ef5355b8786 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02e0431a3db554019b816936b597d618256b705d +refs/heads/master: 119fe5e06800afc197781ebc8c2d8ca7d03497c8 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 0f0cf374c775..4ad789d268fe 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -992,6 +992,9 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu) if (p->se.block_start) p->se.block_start -= clock_offset; #endif + if (likely(new_rq->cfs.min_vruntime)) + p->se.vruntime -= old_rq->cfs.min_vruntime - + new_rq->cfs.min_vruntime; __set_task_cpu(p, new_cpu); }