---

yaml --- r: 324057 b: refs/heads/master c: 48a8ca0 h: refs/heads/master i: 324055: 3daa049 v: v3
git-mirror · Sep 26, 2012 · 31fe67d · 31fe67d
1 parent e2df27f
commit 31fe67d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git 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
@@ -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
diff --git 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
  */
-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 @@