---

yaml --- r: 205437 b: refs/heads/master c: bbc8cb5 h: refs/heads/master i: 205435: a07b78a v: v3
git-mirror · Jul 17, 2010 · 05221bb · 05221bb
1 parent deecccc
commit 05221bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5343bdb8fd076f16edc9d113a9e35e2a1d1f4966
+refs/heads/master: bbc8cb5baead9607309583b20873ab0cc8d89eaf
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -2425,14 +2425,14 @@ static inline void update_sg_lb_stats(struct sched_domain *sd,
 	 * domains. In the newly idle case, we will allow all the cpu's
 	 * to do the newly idle load balance.
 	 */
-	if (idle != CPU_NEWLY_IDLE && local_group &&
-	    balance_cpu != this_cpu) {
-		*balance = 0;
-		return;
+	if (idle != CPU_NEWLY_IDLE && local_group) {
+		if (balance_cpu != this_cpu) {
+			*balance = 0;
+			return;
+		}
+		update_group_power(sd, this_cpu);
 	}
 
-	update_group_power(sd, this_cpu);
-
 	/* Adjust by relative CPU power of the group */
 	sgs->avg_load = (sgs->group_load * SCHED_LOAD_SCALE) / group->cpu_power;