Merge branch 'for-linus' of git://git.kernel.dk/linux-block · a93a132927 - Gogs

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

Linus Torvalds 14 years ago

parent

757c26b804 11ccf116d0

commit

a93a132927

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
block/blk-core.c
							 
								View 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) {