block: Relax a check in blk_start_queue()

[mirror_ubuntu-artful-kernel.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index dbecbf4a64e05b764a1ba0a3c4dfe8f01bc7aac1..eeff6d64c6b2fa2950685cf9ae52557f69084fe0 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -280,7 +280,7 @@ EXPORT_SYMBOL(blk_start_queue_async);
 void blk_start_queue(struct request_queue *q)
 {
        lockdep_assert_held(q->queue_lock);
-       WARN_ON(!irqs_disabled());
+       WARN_ON(!in_interrupt() && !irqs_disabled());
        WARN_ON_ONCE(q->mq_ops);
 
        queue_flag_clear(QUEUE_FLAG_STOPPED, q);