X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=block%2Fblk-mq.c;fp=block%2Fblk-mq.c;h=7111bd4180e792cf705f062cfe48b797d86ed6b8;hb=af550e4c968294398fc76b075f12d51c76caf753;hp=45f994c100446ca6c5df00e8737989a9563ddc5c;hpb=b361c9027b4e4159e7bcca4eb64fd26507c19994;p=linux-2.6-microblaze.git

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 45f994c10044..7111bd4180e7 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1166,10 +1166,11 @@ static inline bool blk_mq_complete_need_ipi(struct request *rq)
 	if (force_irqthreads())
 		return false;
 
-	/* same CPU or cache domain?  Complete locally */
+	/* same CPU or cache domain and capacity?  Complete locally */
 	if (cpu == rq->mq_ctx->cpu ||
 	    (!test_bit(QUEUE_FLAG_SAME_FORCE, &rq->q->queue_flags) &&
-	     cpus_share_cache(cpu, rq->mq_ctx->cpu)))
+	     cpus_share_cache(cpu, rq->mq_ctx->cpu) &&
+	     cpus_equal_capacity(cpu, rq->mq_ctx->cpu)))
 		return false;
 
 	/* don't try to IPI to an offline CPU */