---

yaml --- r: 182504 b: refs/heads/master c: baa8c11 h: refs/heads/master v: v3
git-mirror · Jan 21, 2010 · 59c4f2f · 59c4f2f
1 parent 56e456b
commit 59c4f2f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 230059de77a4e0f6afba98073e73bc9fd471506e
+refs/heads/master: baa8c1102f0cd86e69c1497d61d2ee177e663663
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -2065,6 +2065,10 @@ static int move_tasks(struct rq *this_rq, int this_cpu, struct rq *busiest,
 		 */
 		if (idle == CPU_NEWLY_IDLE && this_rq->nr_running)
 			break;
+
+		if (raw_spin_is_contended(&this_rq->lock) ||
+				raw_spin_is_contended(&busiest->lock))
+			break;
 #endif
 	} while (load_moved && max_load_move > total_load_moved);