From 9f3ae9f5f1fbeb0e4917aba65e6cefc78b8707c3 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 17 Sep 2012 06:24:58 +0200
Subject: [PATCH] --- yaml --- r: 324111 b: refs/heads/master c:
 0ed23b3e495807809873bb607d12c857ae9ab7c2 h: refs/heads/master i:   324109:
 91fcf1cd7afcced3af5bd1c7d3ae908124521a43   324107:
 4a2ef28b132cc7ae91da2a163090a06382373d60   324103:
 ca4c257d37d3ec9424673fe1c487a210558014b1   324095:
 3da3b066dad61e3bea619d8deae2fb1a328f3fc3 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/s390/kernel/Makefile | 8 ++------
 trunk/arch/s390/kernel/setup.c  | 2 --
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index b9be66940370..b0f7d24a9355 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 708c39db0ec8461c3ef1ac333ac7bb9f28833d5a
+refs/heads/master: 0ed23b3e495807809873bb607d12c857ae9ab7c2
diff --git a/trunk/arch/s390/kernel/Makefile b/trunk/arch/s390/kernel/Makefile
index 249aaeb65d35..4da52fe31743 100644
--- a/trunk/arch/s390/kernel/Makefile
+++ b/trunk/arch/s390/kernel/Makefile
@@ -23,10 +23,11 @@ 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 \
 	    processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o \
 	    debug.o irq.o ipl.o dis.o diag.o mem_detect.o sclp.o vdso.o \
-	    sysinfo.o jump_label.o lgr.o os_info.o
+	    sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o
 
 obj-y	+= $(if $(CONFIG_64BIT),entry64.o,entry.o)
 obj-y	+= $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
+obj-y	+= $(if $(CONFIG_64BIT),relocate_kernel64.o,relocate_kernel.o)
 
 extra-y				+= head.o vmlinux.lds
 extra-y				+= $(if $(CONFIG_64BIT),head64.o,head31.o)
@@ -54,11 +55,6 @@ obj-$(CONFIG_PERF_EVENTS)	+= perf_event.o perf_cpum_cf.o
 obj-y				+= runtime_instr.o cache.o
 endif
 
-# Kexec part
-S390_KEXEC_OBJS := machine_kexec.o
-S390_KEXEC_OBJS += $(if $(CONFIG_64BIT),relocate_kernel64.o,relocate_kernel.o)
-obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS)
-
 # vdso
 obj-$(CONFIG_64BIT)		+= vdso64/
 obj-$(CONFIG_32BIT)		+= vdso32/
diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
index 7d27b0ab304b..afa9fdba200e 100644
--- a/trunk/arch/s390/kernel/setup.c
+++ b/trunk/arch/s390/kernel/setup.c
@@ -584,9 +584,7 @@ static void __init setup_memory_end(void)
 
 static void __init setup_vmcoreinfo(void)
 {
-#ifdef CONFIG_KEXEC
 	mem_assign_absolute(S390_lowcore.vmcore_info, paddr_vmcoreinfo_note());
-#endif
 }
 
 #ifdef CONFIG_CRASH_DUMP