diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 17:02:03 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 17:02:03 -0500 |
| commit | 1448f586e7924a4e08614fc6ed5dc91d6468eab2 (patch) | |
| tree | 55f4df1b5ec39a30054bc07c13d6ccbde8e30550 /block | |
| parent | 83f66d8d352951a36a4f1270f0af37d098a47b3f (diff) | |
| parent | 10def3a6779924f7bb130200b8b940caf2914111 (diff) | |
Merge tag 'v4.4.89' into v4.4-rt
This is the 4.4.89 stable release
Conflicts:
block/blk-core.c
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 7a7926b1b4b5..a9395a02a564 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -236,7 +236,7 @@ EXPORT_SYMBOL(blk_start_queue_async); **/ void blk_start_queue(struct request_queue *q) { - WARN_ON_NONRT(!irqs_disabled()); + WARN_ON_NONRT(!in_interrupt() && !irqs_disabled()); queue_flag_clear(QUEUE_FLAG_STOPPED, q); __blk_run_queue(q); |