Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

…linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: fix possible recursive rq->lock
mariux64 · Jan 7, 2009 · 8cfc7f9 · 8cfc7f9
2 parents b424e8d + da8d508
commit 8cfc7f9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/kernel/sched.c b/kernel/sched.c
@@ -3728,8 +3728,13 @@ load_balance_newidle(int this_cpu, struct rq *this_rq, struct sched_domain *sd,
 		}
 
 		double_unlock_balance(this_rq, busiest);
+		/*
+		 * Should not call ttwu while holding a rq->lock
+		 */
+		spin_unlock(&this_rq->lock);
 		if (active_balance)
 			wake_up_process(busiest->migration_thread);
+		spin_lock(&this_rq->lock);
 
 	} else
 		sd->nr_balance_failed = 0;