diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-09-19 15:50:16 +1000 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-09-19 08:21:51 -0600 |
| commit | 8ec2ef2b66ea2fd00acc28aca8edaad441dbb424 (patch) | |
| tree | 5f46c82958d879c841ae666c7fbeb1a520eb08db /block | |
| parent | 9151bcb4fb38aab04cdc67cc3b3e11396db1b8b4 (diff) | |
| download | op-kernel-dev-8ec2ef2b66ea2fd00acc28aca8edaad441dbb424.zip op-kernel-dev-8ec2ef2b66ea2fd00acc28aca8edaad441dbb424.tar.gz | |
blk_mq: linux/blk-mq.h does not include all the headers it depends on
and building block/blk-mq-pci.o should depend on CONFIG_BLOCK
Fixes: 973c4e372c8f ("blk-mq: provide a default queue mapping for PCI device")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/Kconfig | 5 | ||||
| -rw-r--r-- | block/Makefile | 2 | ||||
| -rw-r--r-- | block/blk-mq-pci.c | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/block/Kconfig b/block/Kconfig index 161491d..5155338 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -124,4 +124,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 diff --git a/block/Makefile b/block/Makefile index 2447a0b..37a0d93 100644 --- a/block/Makefile +++ b/block/Makefile @@ -22,4 +22,4 @@ obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o -obj-$(CONFIG_PCI) += blk-mq-pci.o +obj-$(CONFIG_BLK_MQ_PCI) += blk-mq-pci.o diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c index 33c7bd7..966c216 100644 --- a/block/blk-mq-pci.c +++ b/block/blk-mq-pci.c @@ -10,6 +10,8 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. */ +#include <linux/kobject.h> +#include <linux/blkdev.h> #include <linux/blk-mq.h> #include <linux/blk-mq-pci.h> #include <linux/pci.h> |
