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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1283,7 +1283,7 @@ get_rq:

	if (test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags) \|\|		if (test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags) \|\|
	bio_flagged(bio, BIO_CPU_AFFINE))		bio_flagged(bio, BIO_CPU_AFFINE))
	req->cpu = smp_processor_id();		req->cpu = raw_smp_processor_id();

	plug = current->plug;		plug = current->plug;
	if (plug) {		if (plug) {