---

yaml --- r: 366107 b: refs/heads/master c: de5eb2d h: refs/heads/master i: 366105: 2d2b89c 366103: 5fb2ffd v: v3
git-mirror · Apr 24, 2013 · 768679c · 768679c
1 parent 43ca0e5
commit 768679c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1cd0858100c67273f2c74344e0c464344c4a982
+refs/heads/master: de5eb2dd7f171ee8a45d23cd41aa2efe9ab922b3
diff --git a/trunk/kernel/sched/fair.c b/trunk/kernel/sched/fair.c
@@ -5523,10 +5523,11 @@ static void rebalance_domains(int cpu, enum cpu_idle_type idle)
 		if (time_after_eq(jiffies, sd->last_balance + interval)) {
 			if (load_balance(cpu, rq, sd, idle, &balance)) {
 				/*
-				 * We've pulled tasks over so either we're no
-				 * longer idle.
+				 * The LBF_SOME_PINNED logic could have changed
+				 * env->dst_cpu, so we can't know our idle
+				 * state even if we migrated tasks. Update it.
 				 */
-				idle = CPU_NOT_IDLE;
+				idle = idle_cpu(cpu) ? CPU_IDLE : CPU_NOT_IDLE;
 			}
 			sd->last_balance = jiffies;
 		}