diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:02:53 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:02:53 +0800 |
| commit | adede2462ee41680ca0b9463f9754c32d5f0e1aa (patch) | |
| tree | 4c29bdd4cfc1d25ebe6a1ac36add53f4800bd512 /block/blk-core.c | |
| parent | 654dda7d56022e2149483701df5a7fb203594267 (diff) | |
| parent | 95a8e64a288afaadb5e77210df0dfa02ffd0eb43 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-17.09-android
Diffstat (limited to 'block/blk-core.c')
| -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 7d6aeb286271..8ac2b531d468 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -196,7 +196,7 @@ EXPORT_SYMBOL(blk_delay_queue); **/ 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); |