]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 17:02:58 +0000 (10:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 17:02:58 +0000 (10:02 -0700)
* 'for-linus' of git://git.kernel.dk/linux-block:
  block: fix warning with calling smp_processor_id() in preemptible section

block/blk-core.c

index f8cb099518305949b154ce6e065be17109577d45..f9255815a5bbb840eba25f7ad6d44fe6bddc4110 100644 (file)
@@ -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) {