---

yaml --- r: 69069 b: refs/heads/master c: 8465e79 h: refs/heads/master i: 69067: 19163f0 v: v3
git-mirror · Oct 15, 2007 · 13cf3c9 · 13cf3c9
1 parent 3ad8649
commit 13cf3c9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddc972975091ba5f839bf24d0f9ef54fe90ee741
+refs/heads/master: 8465e792e82c567b80358e38732164b770ed4b7f
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -479,13 +479,16 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 	if (initial && sched_feat(START_DEBIT))
 		vruntime += __sched_vslice(cfs_rq->nr_running + 1);
 
-	if (!initial && sched_feat(NEW_FAIR_SLEEPERS)) {
-		s64 latency = cfs_rq->min_vruntime - se->last_min_vruntime;
-		if (latency < 0 || !cfs_rq->nr_running)
-			latency = 0;
-		else
-			latency = min_t(s64, latency, sysctl_sched_latency);
-		vruntime -= latency;
+	if (!initial) {
+		if (sched_feat(NEW_FAIR_SLEEPERS)) {
+			s64 latency = cfs_rq->min_vruntime - se->last_min_vruntime;
+			if (latency < 0 || !cfs_rq->nr_running)
+				latency = 0;
+			else
+				latency = min_t(s64, latency, sysctl_sched_latency);
+			vruntime -= latency;
+		}
+		vruntime = max(vruntime, se->vruntime);
 	}
 
 	se->vruntime = vruntime;