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;