---

yaml --- r: 232500 b: refs/heads/master c: b815f19 h: refs/heads/master v: v3
git-mirror · Jan 26, 2011 · 4bb7a1a · 4bb7a1a
1 parent 144fb32
commit 4bb7a1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e37b6a7b27b400c3aa488db8c6629a05095bc79c
+refs/heads/master: b815f1963e47b9b69bb17e0588bd5af5b1114ae0
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -722,7 +722,7 @@ static void update_cfs_load(struct cfs_rq *cfs_rq, int global_update)
 	u64 now, delta;
 	unsigned long load = cfs_rq->load.weight;
 
-	if (!cfs_rq)
+	if (cfs_rq->tg == &root_task_group)
 		return;
 
 	now = rq_of(cfs_rq)->clock;
@@ -830,9 +830,6 @@ static void update_cfs_shares(struct cfs_rq *cfs_rq, long weight_delta)
 	struct sched_entity *se;
 	long shares;
 
-	if (!cfs_rq)
-		return;
-
 	tg = cfs_rq->tg;
 	se = tg->se[cpu_of(rq_of(cfs_rq))];
 	if (!se)