commit a93a1329271038f0e8337061d3b41b3b212a851e
author Linus Torvalds <torvalds@linux-foundation.org> Tue Jul 26 10:02:58 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Jul 26 10:02:58 2011 -0700
tree e33d0e6a2959e8aae8a7a9cb03581340010d752c
parent 757c26b804428ef10888b8e00f34994dbe361d3a
parent 11ccf116d0d756d06989775288e41f737d98e0c5

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

block/blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index f8cb099..f925581 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1283,7 +1283,7 @@
 
 	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) {