From: Jens Axboe <axboe@fb.com>
Date: Wed, 16 Apr 2014 15:23:48 +0000 (-0600)
Subject: blk-mq: don't use preempt_count() to check for right CPU
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fd1270d5df6a005e1248e87042159a799cc4b2c9;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

blk-mq: don't use preempt_count() to check for right CPU

UP or CONFIG_PREEMPT_NONE will return 0, and what we really
want to check is whether or not we are on the right CPU.
So don't make PREEMPT part of this, just test the CPU in
the mask directly.

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 9180052d42cc..1fa01ff0f9bc 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -534,7 +534,7 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)
 	LIST_HEAD(rq_list);
 	int bit, queued;
 
-	WARN_ON(!preempt_count());
+	WARN_ON(!cpumask_test_cpu(raw_smp_processor_id(), hctx->cpumask));
 
 	if (unlikely(test_bit(BLK_MQ_S_STOPPED, &hctx->state)))
 		return;