---

yaml --- r: 158379 b: refs/heads/master c: b5d9d73 h: refs/heads/master i: 158377: a45ad0c 158375: 10fb5bc v: v3
git-mirror · Sep 8, 2009 · 080482b · 080482b
1 parent 9c06ece
commit 080482b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8fae3ec5f118dc92517dcbed3ecf69ddb641d0f
+refs/heads/master: b5d9d734a53e0204aab0089079cbde2a1285a38f
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -728,11 +728,11 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 
 			vruntime -= thresh;
 		}
-
-		/* ensure we never gain time by being placed backwards. */
-		vruntime = max_vruntime(se->vruntime, vruntime);
 	}
 
+	/* ensure we never gain time by being placed backwards. */
+	vruntime = max_vruntime(se->vruntime, vruntime);
+
 	se->vruntime = vruntime;
 }
 
@@ -1756,6 +1756,8 @@ static void task_new_fair(struct rq *rq, struct task_struct *p)
 	sched_info_queued(p);
 
 	update_curr(cfs_rq);
+	if (curr)
+		se->vruntime = curr->vruntime;
 	place_entity(cfs_rq, se, 1);
 
 	/* 'curr' will be NULL if the child belongs to a different group */