diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-10-14 20:14:01 -0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-10-14 20:14:01 -0400 |
| commit | 07aaae44f5a3962c3a410a6dd7936dfa7dece2b9 (patch) | |
| tree | 0cdb5735800ddd63d8850aa26d3a3f1f3334267a /block/blk-softirq.c | |
| parent | 07a062140372187642003e02a49edc8a2115c1ca (diff) | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
Merge commit 'v3.1-rc9' into fbdev-next
Diffstat (limited to 'block/blk-softirq.c')
| -rw-r--r-- | block/blk-softirq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-softirq.c b/block/blk-softirq.c index 58340d0cb23a..1366a89d8e66 100644 --- a/block/blk-softirq.c +++ b/block/blk-softirq.c | |||
| @@ -115,7 +115,7 @@ void __blk_complete_request(struct request *req) | |||
| 115 | /* | 115 | /* |
| 116 | * Select completion CPU | 116 | * Select completion CPU |
| 117 | */ | 117 | */ |
| 118 | if (test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags) && req->cpu != -1) { | 118 | if (req->cpu != -1) { |
| 119 | ccpu = req->cpu; | 119 | ccpu = req->cpu; |
| 120 | if (!test_bit(QUEUE_FLAG_SAME_FORCE, &q->queue_flags)) { | 120 | if (!test_bit(QUEUE_FLAG_SAME_FORCE, &q->queue_flags)) { |
| 121 | ccpu = blk_cpu_to_group(ccpu); | 121 | ccpu = blk_cpu_to_group(ccpu); |