From ff5e420846d20a034e2fe06e922d50b3fd0caee2 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 27 Sep 2006 18:26:05 +0900
Subject: [PATCH] --- yaml --- r: 36319 b: refs/heads/master c:
 9d549a7d8ef71f684a35cf1e438543957cf81d12 h: refs/heads/master i:   36317:
 ddb19b51feb7bc04594dcf1028c34c069527cf7f   36315:
 4a5906df959caadfc89854f8eebadcff0ff32d07   36311:
 6466b208250b8e1648026f998d386e37a50f8467   36303:
 477f1053887d96411d23c7351dce919d938a53f6   36287:
 f5b8816628b06d56cc334414bb1639b9bfcaf849 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/sh/kernel/machine_kexec.c |  6 ------
 trunk/arch/sh/kernel/process.c       | 10 ----------
 trunk/include/asm-sh/kexec.h         |  9 +++------
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 857767ab12d9..5b7a0ee20bff 100644
--- 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
index 6bcd8d92399f..08587cdb64d6 100644
--- 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
index 2167746e88f1..630ec1af2483 100644
--- 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
index a5f85e9e428d..9d235af20cdd 100644
--- 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 */