From b8efd69c4fc50a747ee33e67b121618a7ac18382 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Fri, 26 Apr 2013 16:47:28 +0200 Subject: [PATCH] --- yaml --- r: 373271 b: refs/heads/master c: 066b9fd660befd59dff77e24963338bfeabb8c3b h: refs/heads/master i: 373269: 93f7979118a13fdd6c2c6b057f2b3a0110535ebd 373267: 976361f5fd7c8a5f5c4fd973a106d6f698af1f88 373263: 6a59f91a4ae9bdc73b1bef722515e9c384050a09 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/Makefile | 2 +- trunk/arch/s390/mm/Makefile | 2 +- trunk/arch/s390/{kernel => mm}/mem_detect.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename trunk/arch/s390/{kernel => mm}/mem_detect.c (100%) diff --git a/[refs] b/[refs] index 0627f4907bba..b677b1bfb934 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe72ffba3eaf4f07933dc2047be934290113d357 +refs/heads/master: 066b9fd660befd59dff77e24963338bfeabb8c3b diff --git a/trunk/arch/s390/kernel/Makefile b/trunk/arch/s390/kernel/Makefile index 1386fcaf4ef6..4bb2a4656163 100644 --- a/trunk/arch/s390/kernel/Makefile +++ b/trunk/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/trunk/arch/s390/mm/Makefile b/trunk/arch/s390/mm/Makefile index 640bea12303c..839592ca265c 100644 --- a/trunk/arch/s390/mm/Makefile +++ b/trunk/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/trunk/arch/s390/kernel/mem_detect.c b/trunk/arch/s390/mm/mem_detect.c similarity index 100% rename from trunk/arch/s390/kernel/mem_detect.c rename to trunk/arch/s390/mm/mem_detect.c