---

yaml --- r: 87387 b: refs/heads/master c: e22ecef h: refs/heads/master i: 87385: d68f9c1 87383: ccdb354 v: v3
git-mirror · Mar 15, 2008 · 7b2b986 · 7b2b986
1 parent 33d828e
commit 7b2b986
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa2ac25229cd4d0280f6174c42712744ad61b140
+refs/heads/master: e22ecef1d2658ba54ed7d3fdb5d60829fb434c23
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -528,8 +528,10 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 
 	if (!initial) {
 		/* sleeps upto a single latency don't count. */
-		if (sched_feat(NEW_FAIR_SLEEPERS))
-			vruntime -= sysctl_sched_latency;
+		if (sched_feat(NEW_FAIR_SLEEPERS)) {
+			vruntime -= calc_delta_fair(sysctl_sched_latency,
+						    &cfs_rq->load);
+		}
 
 		/* ensure we never gain time by being placed backwards. */
 		vruntime = max_vruntime(se->vruntime, vruntime);