summaryrefslogtreecommitdiffstats
path: root/block/Makefile
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-06-11 08:44:41 +0200
committerJens Axboe <axboe@kernel.dk>2020-06-24 09:15:56 -0600
commitc3077b5d97a39223a2d4b95a21ccff660836170f (patch)
treed8a3e414547a17c4db46cc3bc6c2f51278b57709 /block/Makefile
parent48778464bb7d346b47157d21ffde2af6b2d39110 (diff)
downloadlinux-c3077b5d97a39223a2d4b95a21ccff660836170f.tar.gz
linux-c3077b5d97a39223a2d4b95a21ccff660836170f.tar.bz2
linux-c3077b5d97a39223a2d4b95a21ccff660836170f.zip
blk-mq: merge blk-softirq.c into blk-mq.c
__blk_complete_request is only called from the blk-mq code, and duplicates a lot of code from blk-mq.c. Move it there to prepare for better code sharing and simplifications. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Daniel Wagner <dwagner@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/Makefile')
-rw-r--r--block/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/Makefile b/block/Makefile
index 78719169fb2a..8d841f5f986f 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -5,7 +5,7 @@
obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-sysfs.o \
blk-flush.o blk-settings.o blk-ioc.o blk-map.o \
- blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
+ blk-exec.o blk-merge.o blk-timeout.o \
blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \
blk-mq-sysfs.o blk-mq-cpumap.o blk-mq-sched.o ioctl.o \
genhd.o ioprio.o badblocks.o partitions/ blk-rq-qos.o