summaryrefslogtreecommitdiff
path: root/kernel/sched_fair.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2007-10-15 17:00:11 +0200
committerIngo Molnar <mingo@elte.hu>2007-10-15 17:00:11 +0200
commit94359f05cb7e1fed0deccc83ebc30a1175a9ae16 (patch)
treeb187343db9950f9396f832318d061106a9592d41 /kernel/sched_fair.c
parentdc1f31c90cfa067af6f7000db7a5383c7667ccba (diff)
sched: undo some of the recent changes
undo some of the recent changes that are not needed after all, such as last_min_vruntime. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Diffstat (limited to 'kernel/sched_fair.c')
-rw-r--r--kernel/sched_fair.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 0228de186503..62a9ee8db13e 100644
--- a/kernel/sched_fair.c
+++ b/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)