summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-05-19 20:01:52 -0600
committerJens Axboe <axboe@fb.com>2014-05-19 20:01:52 -0600
commit719c555f4424b194905aa3512a754c0444f27ce8 (patch)
tree6afd4d62345f1fac7046e23d8907ac555846eb5a
parent39a9f97e5ea99e048c4980c23cf197f6e77995cb (diff)
downloadlinux-719c555f4424b194905aa3512a754c0444f27ce8.tar.gz
linux-719c555f4424b194905aa3512a754c0444f27ce8.tar.bz2
linux-719c555f4424b194905aa3512a754c0444f27ce8.zip
block: move mm/bounce.c to block/
Continue moving some of the block files that are scattered around. bounce.c contains only code for bouncing the contents of a bio. It's block proper code, not mm code. Suggested-by: Ming Lei <tom.leiming@gmail.com> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--block/Makefile1
-rw-r--r--block/bounce.c (renamed from mm/bounce.c)0
-rw-r--r--mm/Makefile1
3 files changed, 1 insertions, 1 deletions
diff --git a/block/Makefile b/block/Makefile
index b4c4d3b99a2d..a2ce6ac935ec 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-tag.o blk-sysfs.o \
genhd.o scsi_ioctl.o partition-generic.o ioprio.o \
partitions/
+obj-$(CONFIG_BOUNCE) += bounce.o
obj-$(CONFIG_BLK_DEV_BSG) += bsg.o
obj-$(CONFIG_BLK_DEV_BSGLIB) += bsg-lib.o
obj-$(CONFIG_BLK_CGROUP) += blk-cgroup.o
diff --git a/mm/bounce.c b/block/bounce.c
index 523918b8c6dc..523918b8c6dc 100644
--- a/mm/bounce.c
+++ b/block/bounce.c
diff --git a/mm/Makefile b/mm/Makefile
index b484452dac57..0173940407f6 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -30,7 +30,6 @@ endif
obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
-obj-$(CONFIG_BOUNCE) += bounce.o
obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o
obj-$(CONFIG_FRONTSWAP) += frontswap.o
obj-$(CONFIG_ZSWAP) += zswap.o