Merge commit 'v2.6.39-rc4' into sched/core

Merge reason: Pick up upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
2011-04-21 11:39:21 +02:00
parent 057f3fadb3 f0e615c3cb
commit 42ac9e87fd
199 changed files with 2306 additions and 1161 deletions
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4218,7 +4218,7 @@ need_resched:
 			 */
 			if (blk_needs_flush_plug(prev)) {
 				raw_spin_unlock(&rq->lock);
-				blk_flush_plug(prev);
+				blk_schedule_flush_plug(prev);
 				raw_spin_lock(&rq->lock);
 			}
 		}