From 7c12e01455ecf1d3881e09bf793ae1b1cbf9dfc8 Mon Sep 17 00:00:00 2001 From: Dmitriy Beykun Date: Mon, 7 Jan 2013 01:45:24 +0400 Subject: [PATCH 1/2] block: fix "BUG: using smp_processor_id() in preemptible code" Source https://lkml.org/lkml/2011/7/26/6 Patch by Ming Lei --- block/blk-core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 0c87a803abf0e6..a17af5e636bd34 100755 --- 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) { From ab100800458ae58f9921826f7e489aa6e52c3e65 Mon Sep 17 00:00:00 2001 From: Dmitriy Beykun Date: Mon, 7 Jan 2013 01:49:06 +0400 Subject: [PATCH 2/2] mali: fix build error. --- drivers/media/video/samsung/mali/linux/mali_kernel_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/video/samsung/mali/linux/mali_kernel_linux.c b/drivers/media/video/samsung/mali/linux/mali_kernel_linux.c index 5de0eaabd294d9..e44d321904c7ea 100755 --- 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; }