Browse Source

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>
Heiko Carstens 13 years ago
parent
commit
48a8ca03f8
3 changed files with 5 additions and 15 deletions
  1. 1 1
      arch/s390/kernel/Makefile
  2. 0 14
      arch/s390/kernel/crash.c
  3. 4 0
      arch/s390/kernel/machine_kexec.c

+ 1 - 1
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)
 

+ 0 - 14
arch/s390/kernel/crash.c

@@ -1,14 +0,0 @@
-/*
- * Copyright IBM Corp. 2005
- *
- * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
- *
- */
-
-#include <linux/threads.h>
-#include <linux/kexec.h>
-#include <linux/reboot.h>
-
-void machine_crash_shutdown(struct pt_regs *regs)
-{
-}

+ 4 - 0
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
  */