diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-14 08:10:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-14 08:10:27 -0700 |
| commit | a985aabe4d7a720b109c2b63549f8641676a9c88 (patch) | |
| tree | 47484925d172a10eb65bcf5594d1bcd85b9c7032 | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| parent | revert "sched: fix fair sleepers" (diff) | |
| download | linux-dev-a985aabe4d7a720b109c2b63549f8641676a9c88.tar.xz linux-dev-a985aabe4d7a720b109c2b63549f8641676a9c88.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel:
revert "sched: fix fair sleepers"
| -rw-r--r-- | kernel/sched_fair.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 86a93376282c..0080968d3e4a 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c @@ -510,10 +510,8 @@ 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)) { - vruntime -= calc_delta_fair(sysctl_sched_latency, - &cfs_rq->load); - } + if (sched_feat(NEW_FAIR_SLEEPERS)) + vruntime -= sysctl_sched_latency; /* ensure we never gain time by being placed backwards. */ vruntime = max_vruntime(se->vruntime, vruntime); |