Move dmapool.c to mm/ directory

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>

diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index b39ea3f59c9b77edc9ec636383bcc3f3f3225f4e..ed0a722c38ca8962c07be9b7a260ceb175ec9819 100644 (file)
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -5,7 +5,7 @@ obj-y                   := core.o sys.o bus.o dd.o \
                           cpu.o firmware.o init.o map.o devres.o \
                           attribute_container.o transport_class.o
 obj-y                  += power/
-obj-$(CONFIG_HAS_DMA)  += dma-mapping.o dmapool.o
+obj-$(CONFIG_HAS_DMA)  += dma-mapping.o
 obj-$(CONFIG_ISA)      += isa.o
 obj-$(CONFIG_FW_LOADER)        += firmware_class.o
 obj-$(CONFIG_NUMA)     += node.o

diff --git a/mm/Makefile b/mm/Makefile
index 5c0b0ea7572d8b04aa62ec2bbe2bd566eadef165..e222cc5a79cda5909ce2c5730922ffe06160624b 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -15,6 +15,7 @@ obj-y                 := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \
 
 obj-$(CONFIG_BOUNCE)   += bounce.o
 obj-$(CONFIG_SWAP)     += page_io.o swap_state.o swapfile.o thrash.o
+obj-$(CONFIG_HAS_DMA)  += dmapool.o
 obj-$(CONFIG_HUGETLBFS)        += hugetlb.o
 obj-$(CONFIG_NUMA)     += mempolicy.o
 obj-$(CONFIG_SPARSEMEM)        += sparse.o

diff --git a/drivers/base/dmapool.c b/mm/dmapool.c
similarity index 100%
rename from drivers/base/dmapool.c
rename to mm/dmapool.c