From e73dd3ba3ad94a1cac9aaae9d57a39e6dc76d6ae Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri, 27 Jun 2008 13:41:34 +0200
Subject: [PATCH] --- yaml --- r: 100236 b: refs/heads/master c:
 cd80917e4ff465ea77106f8e4fb631eedc4cf426 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bbfb807eb4b6..bc94ef80c818 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b75217df39e6d75889cc6f8050343286aff4a5
+refs/heads/master: cd80917e4ff465ea77106f8e4fb631eedc4cf426
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 6c5eb3bc37e0..1cff969f6646 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -1549,6 +1549,9 @@ tg_shares_up(struct task_group *tg, int cpu, struct sched_domain *sd)
 	if (!sd->parent || !(sd->parent->flags & SD_LOAD_BALANCE))
 		shares = tg->shares;
 
+	if (!rq_weight)
+		rq_weight = cpus_weight(sd->span) * NICE_0_LOAD;
+
 	for_each_cpu_mask(i, sd->span) {
 		struct rq *rq = cpu_rq(i);
 		unsigned long flags;