diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2006-09-27 18:26:05 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 18:26:05 +0900 |
| commit | 9d549a7d8ef71f684a35cf1e438543957cf81d12 (patch) | |
| tree | 0090b908ba5fe448c082b2e2da51d7136cb04e29 | |
| parent | sh: Optimized readsl()/writesl() support. (diff) | |
| download | linux-dev-9d549a7d8ef71f684a35cf1e438543957cf81d12.tar.xz linux-dev-9d549a7d8ef71f684a35cf1e438543957cf81d12.zip | |
sh: Update kexec support for API changes.
This was falling a bit behind..
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/kernel/machine_kexec.c | 6 | ||||
| -rw-r--r-- | arch/sh/kernel/process.c | 10 | ||||
| -rw-r--r-- | include/asm-sh/kexec.h | 9 |
3 files changed, 3 insertions, 22 deletions
diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c index 6bcd8d92399f..08587cdb64d6 100644 --- a/arch/sh/kernel/machine_kexec.c +++ b/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/arch/sh/kernel/process.c b/arch/sh/kernel/process.c index 2167746e88f1..630ec1af2483 100644 --- a/arch/sh/kernel/process.c +++ b/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/include/asm-sh/kexec.h b/include/asm-sh/kexec.h index a5f85e9e428d..9d235af20cdd 100644 --- a/include/asm-sh/kexec.h +++ b/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 */ |