s390/kexec: move machine_crash_shutdown() to machine_kexec.c

machine_crash_shutdown() was the only function in crash.c. So move the function and delete one file. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
git-mirror · Sep 26, 2012 · 48a8ca0 · 48a8ca0
1 parent 1c72592
commit 48a8ca0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
@@ -52,7 +52,7 @@ obj-$(CONFIG_PERF_EVENTS)	+= perf_event.o perf_cpum_cf.o
 obj-$(CONFIG_64BIT)		+= cache.o
 
 # Kexec part
-S390_KEXEC_OBJS := machine_kexec.o crash.o
+S390_KEXEC_OBJS := machine_kexec.o
 S390_KEXEC_OBJS += $(if $(CONFIG_64BIT),relocate_kernel64.o,relocate_kernel.o)
 obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS)
 

diff --git a/arch/s390/kernel/crash.c b/arch/s390/kernel/crash.c
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
@@ -191,6 +191,10 @@ void machine_shutdown(void)
 {
 }
 
+void machine_crash_shutdown(struct pt_regs *regs)
+{
+}
+
 /*
  * Do normal kexec
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -191,6 +191,10 @@ void machine_shutdown(void) @@
     {
     }
+    void machine_crash_shutdown(struct pt_regs *regs)
+    {
+    }
     /*
      * Do normal kexec
      */
@@ Expand Down @@