diff options
author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-09-05 11:09:17 -0400 |
---|---|---|
committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-09-05 11:09:17 -0400 |
commit | aec81c1895a3a300c01dd6219b54dce6b8486bf3 (patch) | |
tree | 56e1ef575ce54290db15db8361a534f56dfe0bf9 /block | |
parent | 19aa953533e6ee9789ab0548851d5d663b7499fb (diff) | |
parent | 4b904b22bc906d5867933b8132ae4d7f31d7645d (diff) |
Merge tag 'v4.9.45' into v4.9-rt
This is the 4.9.45 stable release
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-mq-pci.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c index 966c2169762e..ee9d3d958fbe 100644 --- a/block/blk-mq-pci.c +++ b/block/blk-mq-pci.c @@ -36,12 +36,18 @@ int blk_mq_pci_map_queues(struct blk_mq_tag_set *set, struct pci_dev *pdev) for (queue = 0; queue < set->nr_hw_queues; queue++) { mask = pci_irq_get_affinity(pdev, queue); if (!mask) - return -EINVAL; + goto fallback; for_each_cpu(cpu, mask) set->mq_map[cpu] = queue; } return 0; + +fallback: + WARN_ON_ONCE(set->nr_hw_queues > 1); + for_each_possible_cpu(cpu) + set->mq_map[cpu] = 0; + return 0; } EXPORT_SYMBOL_GPL(blk_mq_pci_map_queues); |