---

yaml --- r: 36319 b: refs/heads/master c: 9d549a7 h: refs/heads/master i: 36317: ddb19b5 36315: 4a5906d 36311: 6466b20 36303: 477f105 36287: f5b8816 v: v3
git-mirror · Sep 27, 2006 · ff5e420 · ff5e420
1 parent 34cc77b
commit ff5e420
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 23 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05ae91585167410dadd1bc8f2e207a062e638a16
+refs/heads/master: 9d549a7d8ef71f684a35cf1e438543957cf81d12
diff --git a/trunk/arch/sh/kernel/machine_kexec.c b/trunk/arch/sh/kernel/machine_kexec.c
@@ -29,12 +29,6 @@ extern const unsigned char relocate_new_kernel[];
 extern const unsigned int relocate_new_kernel_size;
 extern void *gdb_vbr_vector;
 
-/*
- * Provide a dummy crash_notes definition while crash dump arrives to ppc.
- * This prevents breakage of crash_notes attribute in kernel/ksysfs.c.
- */
-void *crash_notes = NULL;
-
 void machine_shutdown(void)
 {
 }

diff --git a/trunk/arch/sh/kernel/process.c b/trunk/arch/sh/kernel/process.c
@@ -81,16 +81,6 @@ void cpu_idle(void)
 
 void machine_restart(char * __unused)
 {
-
-#ifdef CONFIG_KEXEC
-	struct kimage *image;
-	image = xchg(&kexec_image, 0);
-	if (image) {
-		machine_shutdown();
-		machine_kexec(image);
-	}
-#endif
-
 	/* SR.BL=1 and invoke address error to let CPU reset (manual reset) */
 	asm volatile("ldc %0, sr\n\t"
 		     "mov.l @%1, %0" : : "r" (0x10000000), "r" (0x80000001));

diff --git a/trunk/include/asm-sh/kexec.h b/trunk/include/asm-sh/kexec.h
@@ -25,11 +25,8 @@
 
 #define MAX_NOTE_BYTES 1024
 
-#ifndef __ASSEMBLY__
-
-extern void machine_shutdown(void);
-extern void *crash_notes;
-
-#endif /* __ASSEMBLY__ */
+/* Provide a dummy definition to avoid build failures. */
+static inline void crash_setup_regs(struct pt_regs *newregs,
+					struct pt_regs *oldregs) { }
 
 #endif /* _SH_KEXEC_H */