---

yaml --- r: 96188 b: refs/heads/master c: 4615112 h: refs/heads/master v: v3
git-mirror · May 8, 2008 · e7f5c46 · e7f5c46
1 parent 764adad
commit e7f5c46
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf726eab3711cf192405d21688a4b21e07b6188a
+refs/heads/master: 46151122e0a2e80e5a6b2889f595e371fe2b600d
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -662,10 +662,15 @@ 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)) {
+			unsigned long thresh = sysctl_sched_latency;
+
+			/*
+			 * convert the sleeper threshold into virtual time
+			 */
 			if (sched_feat(NORMALIZED_SLEEPER))
-				vruntime -= calc_delta_weight(sysctl_sched_latency, se);
-			else
-				vruntime -= sysctl_sched_latency;
+				thresh = calc_delta_fair(thresh, se);
+
+			vruntime -= thresh;
 		}
 
 		/* ensure we never gain time by being placed backwards. */