diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-09 17:29:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-09 17:29:33 -0700 |
| commit | 12e3d3cdd975fe986cc5c35f60b1467a8ec20b80 (patch) | |
| tree | 14ec935d2e15f454ba69353fcf5329ac67f72e4f /block/Kconfig | |
| parent | 48915c2cbc77eceec2005afb695ac658fede4e0d (diff) | |
| parent | 8ec2ef2b66ea2fd00acc28aca8edaad441dbb424 (diff) | |
| download | linux-stable-12e3d3cdd975fe986cc5c35f60b1467a8ec20b80.tar.gz linux-stable-12e3d3cdd975fe986cc5c35f60b1467a8ec20b80.tar.bz2 linux-stable-12e3d3cdd975fe986cc5c35f60b1467a8ec20b80.zip | |
Merge branch 'for-4.9/block-irq' of git://git.kernel.dk/linux-block
Pull blk-mq irq/cpu mapping updates from Jens Axboe:
"This is the block-irq topic branch for 4.9-rc. It's mostly from
Christoph, and it allows drivers to specify their own mappings, and
more importantly, to share the blk-mq mappings with the IRQ affinity
mappings. It's a good step towards making this work better out of the
box"
* 'for-4.9/block-irq' of git://git.kernel.dk/linux-block:
blk_mq: linux/blk-mq.h does not include all the headers it depends on
blk-mq: kill unused blk_mq_create_mq_map()
blk-mq: get rid of the cpumask in struct blk_mq_tags
nvme: remove the post_scan callout
nvme: switch to use pci_alloc_irq_vectors
blk-mq: provide a default queue mapping for PCI device
blk-mq: allow the driver to pass in a queue mapping
blk-mq: remove ->map_queue
blk-mq: only allocate a single mq_map per tag_set
blk-mq: don't redistribute hardware queues on a CPU hotplug event
Diffstat (limited to 'block/Kconfig')
| -rw-r--r-- | block/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/block/Kconfig b/block/Kconfig index 5136ad4bb6d5..1d4d624492fc 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -125,4 +125,9 @@ config BLOCK_COMPAT depends on BLOCK && COMPAT default y +config BLK_MQ_PCI + bool + depends on BLOCK && PCI + default y + source block/Kconfig.iosched |