s390/mem_detect: move memory detection code to mm folder

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 1386fcaf4ef6c7854838df1563604bca1d74603a..4bb2a46561631ab361c027fdcfc8a1dfd0504cb5 100644 (file)
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -30,7 +30,7 @@ CFLAGS_sysinfo.o += -Iinclude/math-emu -Iarch/s390/math-emu -w
 
 obj-y  := bitmap.o traps.o time.o process.o base.o early.o setup.o vtime.o
 obj-y  += processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o
-obj-y  += debug.o irq.o ipl.o dis.o diag.o mem_detect.o sclp.o vdso.o
+obj-y  += debug.o irq.o ipl.o dis.o diag.o sclp.o vdso.o
 obj-y  += sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o
 obj-y  += dumpstack.o
 

diff --git a/arch/s390/mm/Makefile b/arch/s390/mm/Makefile
index 640bea12303c0a659bcbb235bf191aaee8da4c62..839592ca265cdb620ddbe1c0505e9d9bbe4d428c 100644 (file)
--- a/arch/s390/mm/Makefile
+++ b/arch/s390/mm/Makefile
@@ -3,7 +3,7 @@
 #
 
 obj-y          := init.o fault.o extmem.o mmap.o vmem.o pgtable.o maccess.o
-obj-y          += page-states.o gup.o extable.o pageattr.o
+obj-y          += page-states.o gup.o extable.o pageattr.o mem_detect.o
 
 obj-$(CONFIG_CMM)              += cmm.o
 obj-$(CONFIG_HUGETLB_PAGE)     += hugetlbpage.o

diff --git a/arch/s390/kernel/mem_detect.c b/arch/s390/mm/mem_detect.c
similarity index 100%
rename from arch/s390/kernel/mem_detect.c
rename to arch/s390/mm/mem_detect.c