summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2009-01-15 16:17:15 (GMT)
committerIngo Molnar <mingo@elte.hu>2009-01-15 20:07:57 (GMT)
commit6272d68cc6a5f90c6b1a2228cf0f67b895305d17 (patch)
tree9f7e6635d4ffb9d713d3b2be83a4cd4bd4749080 /kernel
parente17036dac189dd034c092a91df56aa740db7146d (diff)
downloadlinux-6272d68cc6a5f90c6b1a2228cf0f67b895305d17.tar.xz
sched: sched_slice() fixlet
Mike's change: 0a582440f "sched: fix sched_slice())" broke group scheduling by forgetting to reload cfs_rq on each loop. This patch fixes aim7 regression and specjbb2005 regression becomes less than 1.5% on 8-core stokley. Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Tested-by: Jayson King <dev@jaysonking.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched_fair.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 16b419b..5cc1c16 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -429,7 +429,10 @@ static u64 sched_slice(struct cfs_rq *cfs_rq, struct sched_entity *se)
u64 slice = __sched_period(cfs_rq->nr_running + !se->on_rq);
for_each_sched_entity(se) {
- struct load_weight *load = &cfs_rq->load;
+ struct load_weight *load;
+
+ cfs_rq = cfs_rq_of(se);
+ load = &cfs_rq->load;
if (unlikely(!se->on_rq)) {
struct load_weight lw = cfs_rq->load;