Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=94359f05cb7e1fed0deccc83ebc30a1175a9ae16
Commit: 94359f05cb7e1fed0deccc83ebc30a1175a9ae16
Parent: dc1f31c90cfa067af6f7000db7a5383c7667ccba
Author: Ingo Molnar <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 15 17:00:11 2007 +0200
Committer: Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Mon Oct 15 17:00:11 2007 +0200
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 <[EMAIL PROTECTED]>
Signed-off-by: Peter Zijlstra <[EMAIL PROTECTED]>
---
include/linux/sched.h | 1 -
kernel/sched.c | 1 -
kernel/sched_fair.c | 13 +++----------
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index d74830c..2c33227 100644
--- a/include/linux/sched.h
+++ b/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/kernel/sched.c b/kernel/sched.c
index c779bf9..744bd50 100644
--- a/kernel/sched.c
+++ b/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/kernel/sched_fair.c b/kernel/sched_fair.c
index 0228de1..62a9ee8 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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
