Merge pull request #6 from rzk/odroid-3.0.y

Mali-400 build and usage of SMP code in preemptible code fixes.
hardkernel · Jan 8, 2013 · fb06315 · fb06315
2 parents d0d77e6 + ab10080
commit fb06315
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/block/blk-core.c b/block/blk-core.c
@@ -1273,8 +1273,10 @@ static int __make_request(struct request_queue *q, struct bio *bio)
 	init_request_from_bio(req, bio);
 
 	if (test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags) ||
-	    bio_flagged(bio, BIO_CPU_AFFINE))
-		req->cpu = smp_processor_id();
+	    bio_flagged(bio, BIO_CPU_AFFINE)) {
+		req->cpu = get_cpu();
+		put_cpu();
+	}
 
 	plug = current->plug;
 	if (plug) {

diff --git a/drivers/media/video/samsung/mali/linux/mali_kernel_linux.c b/drivers/media/video/samsung/mali/linux/mali_kernel_linux.c
@@ -228,7 +228,7 @@ int mali_driver_init(void)
 	}
 
 	/* print build options */
-	MALI_DEBUG_PRINT(2, ("%s\n", __malidrv_build_info()));
+	/* MALI_DEBUG_PRINT(2, ("%s\n", __malidrv_build_info())); */
 
     return 0;
 }