diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:25 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:25 +0800 |
commit | a759573d34fc8249c416857e15cf8d0fd9c99d1a (patch) | |
tree | cb2d530d42301f84382686fd343f71223e9af157 /block | |
parent | eebd4781fb3bb7b47568d8747d97d269d2649ec9 (diff) | |
parent | cda2b9481445e798669f00fb8275d595f1ff943f (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index be43481bcb12..323cc15b155a 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -235,7 +235,7 @@ EXPORT_SYMBOL(blk_start_queue_async); **/ void blk_start_queue(struct request_queue *q) { - WARN_ON(!irqs_disabled()); + WARN_ON(!in_interrupt() && !irqs_disabled()); queue_flag_clear(QUEUE_FLAG_STOPPED, q); __blk_run_queue(q); |