diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 19:02:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 19:02:58 +0200 |
| commit | a93a1329271038f0e8337061d3b41b3b212a851e (patch) | |
| tree | e33d0e6a2959e8aae8a7a9cb03581340010d752c | |
| parent | Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | block: fix warning with calling smp_processor_id() in preemptible section (diff) | |
| download | linux-a93a1329271038f0e8337061d3b41b3b212a851e.tar.xz linux-a93a1329271038f0e8337061d3b41b3b212a851e.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
* 'for-linus' of git://git.kernel.dk/linux-block:
block: fix warning with calling smp_processor_id() in preemptible section
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index f8cb09951830..f9255815a5bb 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1283,7 +1283,7 @@ get_rq: if (test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags) || bio_flagged(bio, BIO_CPU_AFFINE)) - req->cpu = smp_processor_id(); + req->cpu = raw_smp_processor_id(); plug = current->plug; if (plug) { |