---

yaml --- r: 318404 b: refs/heads/master c: bbf18b1 h: refs/heads/master v: v3
git-mirror · Jul 24, 2012 · 6750575 · 6750575
1 parent 94ccc20
commit 6750575
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85c1e7dae165acd004429f81fe52bfbf55b57a98
+refs/heads/master: bbf18b19495942cc730e8ff11fc3ffadf20cbfe1
diff --git a/trunk/kernel/sched/fair.c b/trunk/kernel/sched/fair.c
@@ -4288,8 +4288,11 @@ static int load_balance(int this_cpu, struct rq *this_rq,
 		/* All tasks on this runqueue were pinned by CPU affinity */
 		if (unlikely(env.flags & LBF_ALL_PINNED)) {
 			cpumask_clear_cpu(cpu_of(busiest), cpus);
-			if (!cpumask_empty(cpus))
+			if (!cpumask_empty(cpus)) {
+				env.loop = 0;
+				env.loop_break = sched_nr_migrate_break;
 				goto redo;
+			}
 			goto out_balanced;
 		}
 	}