From b7965364261fb14f629eb66a9953872107e5dff3 Mon Sep 17 00:00:00 2001
From: Lin Ming <ming.m.lin@intel.com>
Date: Thu, 15 Jan 2009 17:17:15 +0100
Subject: [PATCH] --- yaml --- r: 129816 b: refs/heads/master c:
 6272d68cc6a5f90c6b1a2228cf0f67b895305d17 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched_fair.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a1626814edcd..0705a38a5dcd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e17036dac189dd034c092a91df56aa740db7146d
+refs/heads/master: 6272d68cc6a5f90c6b1a2228cf0f67b895305d17
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index 16b419bb8b0a..5cc1c162044f 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/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;