From dd34d133644cb50b213f3b501a9aba83b27b4c4e Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 15 Oct 2007 17:00:11 +0200 Subject: [PATCH] --- yaml --- r: 69070 b: refs/heads/master c: 785c29ef9573d98b31493c9a68c3589449082108 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a652ef08d2f9..6384b8ee914d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8465e792e82c567b80358e38732164b770ed4b7f +refs/heads/master: 785c29ef9573d98b31493c9a68c3589449082108 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 213294fdcd0f..c779bf9d3552 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -1052,9 +1052,7 @@ 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; + p->se.vruntime -= old_rq->cfs.min_vruntime - new_rq->cfs.min_vruntime; __set_task_cpu(p, new_cpu); }