From 6750575af7ecfaa4fc734244d0b40dba76a19a79 Mon Sep 17 00:00:00 2001
From: Prashanth Nageshappa <prashanth@linux.vnet.ibm.com>
Date: Tue, 19 Jun 2012 17:52:07 +0530
Subject: [PATCH] --- yaml --- r: 318404 b: refs/heads/master c:
 bbf18b19495942cc730e8ff11fc3ffadf20cbfe1 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched/fair.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2511c4c459fc..cb558785cd73 100644
--- 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
index 9361669d4242..f9f9aa0edf3c 100644
--- 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;
 		}
 	}