Merge commit 'v2.6.29-rc1' into timers/urgent

1 files changed, 5 insertions, 0 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 2e3545f57e77..deb5ac8c12f3 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3728,8 +3728,13 @@ redo:
                 }
 
                 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;