Merge branch 'sched-fixes-for-linus' of...

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

parents b424e8d3 da8d5089

kernel/sched.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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;