From 31fe67d085b29a2360b26066fa42419200a52038 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 27 Aug 2012 15:50:29 +0200
Subject: [PATCH] --- yaml --- r: 324057 b: refs/heads/master c:
 48a8ca03f8fd49a4d0c0c8843d4f5a7008dc2656 h: refs/heads/master i:   324055:
 3daa04912ab8f1e4056310c029bfe2f789f0ed4a v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/s390/kernel/Makefile        |  2 +-
 trunk/arch/s390/kernel/crash.c         | 14 --------------
 trunk/arch/s390/kernel/machine_kexec.c |  4 ++++
 4 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 trunk/arch/s390/kernel/crash.c

diff --git a/[refs] b/[refs]
index 865f241bf449..a8a22d1ca044 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c725922dd8274b6e0b370ad33cfaef9013fd70b
+refs/heads/master: 48a8ca03f8fd49a4d0c0c8843d4f5a7008dc2656
diff --git a/trunk/arch/s390/kernel/Makefile b/trunk/arch/s390/kernel/Makefile
index 86b8247134c1..9a111b621f4e 100644
--- a/trunk/arch/s390/kernel/Makefile
+++ b/trunk/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/trunk/arch/s390/kernel/crash.c b/trunk/arch/s390/kernel/crash.c
deleted file mode 100644
index 3819153de8bd..000000000000
--- a/trunk/arch/s390/kernel/crash.c
+++ /dev/null
@@ -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)
-{
-}
diff --git a/trunk/arch/s390/kernel/machine_kexec.c b/trunk/arch/s390/kernel/machine_kexec.c
index 493304bdf1c7..0d5063e0ff79 100644
--- a/trunk/arch/s390/kernel/machine_kexec.c
+++ b/trunk/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
  */