diff --git a/[refs] b/[refs] index 96a2c38f67d0..a44bc426ea89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18a3885fc1ffa92c2212ff0afdf033403d5b0fa0 +refs/heads/master: d7ea17a76916e456fcc78e45142c66f7fb875e3d diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index b53785346850..796baf731976 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -3765,19 +3765,22 @@ static void update_group_power(struct sched_domain *sd, int cpu) { struct sched_domain *child = sd->child; struct sched_group *group, *sdg = sd->groups; + unsigned long power; if (!child) { update_cpu_power(sd, cpu); return; } - sdg->cpu_power = 0; + power = 0; group = child->groups; do { - sdg->cpu_power += group->cpu_power; + power += group->cpu_power; group = group->next; } while (group != child->groups); + + sdg->cpu_power = power; } /**