diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-04-21 05:39:21 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-04-21 05:39:28 -0400 |
commit | 42ac9e87fdd89b77fa2ca0a5226023c1c2d83226 (patch) | |
tree | dfdb1b720347a40f24a89a3e9c2727ae26ad5f01 /kernel/sched.c | |
parent | 057f3fadb347e9c51b07e1b277bbdda79f976768 (diff) | |
parent | f0e615c3cb72b42191b558c130409335812621d8 (diff) |
Merge commit 'v2.6.39-rc4' into sched/core
Merge reason: Pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 27d3e73a2af6..30a29ad46eb1 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -4218,7 +4218,7 @@ need_resched: | |||
4218 | */ | 4218 | */ |
4219 | if (blk_needs_flush_plug(prev)) { | 4219 | if (blk_needs_flush_plug(prev)) { |
4220 | raw_spin_unlock(&rq->lock); | 4220 | raw_spin_unlock(&rq->lock); |
4221 | blk_flush_plug(prev); | 4221 | blk_schedule_flush_plug(prev); |
4222 | raw_spin_lock(&rq->lock); | 4222 | raw_spin_lock(&rq->lock); |
4223 | } | 4223 | } |
4224 | } | 4224 | } |