---

yaml --- r: 69072 b: refs/heads/master c: 94359f0 h: refs/heads/master v: v3
git-mirror · Oct 15, 2007 · d80a9f5 · d80a9f5
1 parent 205de0d
commit d80a9f5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc1f31c90cfa067af6f7000db7a5383c7667ccba
+refs/heads/master: 94359f05cb7e1fed0deccc83ebc30a1175a9ae16
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
@@ -908,7 +908,6 @@ struct sched_entity {
 	u64			sum_exec_runtime;
 	u64			vruntime;
 	u64			prev_sum_exec_runtime;
-	u64			last_min_vruntime;
 
 #ifdef CONFIG_SCHEDSTATS
 	u64			wait_start;

diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -1616,7 +1616,6 @@ static void __sched_fork(struct task_struct *p)
 	p->se.exec_start		= 0;
 	p->se.sum_exec_runtime		= 0;
 	p->se.prev_sum_exec_runtime	= 0;
-	p->se.last_min_vruntime		= 0;
 
 #ifdef CONFIG_SCHEDSTATS
 	p->se.wait_start		= 0;

diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -480,14 +480,9 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 		vruntime += __sched_vslice(cfs_rq->nr_running + 1);
 
 	if (!initial) {
-		if (sched_feat(NEW_FAIR_SLEEPERS)) {
-			s64 latency = cfs_rq->min_vruntime - se->vruntime;
-			if (latency < 0 || !cfs_rq->nr_running)
-				latency = 0;
-			else
-				latency = min_t(s64, latency, sysctl_sched_latency);
-			vruntime -= latency;
-		}
+		if (sched_feat(NEW_FAIR_SLEEPERS))
+			vruntime -= sysctl_sched_latency;
+
 		vruntime = max(vruntime, se->vruntime);
 	}
 
@@ -531,8 +526,6 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep)
 				se->block_start = rq_of(cfs_rq)->clock;
 		}
 #endif
-		/* se->vruntime = entity_key(cfs_rq, se); */
-		se->last_min_vruntime = cfs_rq->min_vruntime;
 	}
 
 	if (se != cfs_rq->curr)