提交 9d549a7d 编写于 作者: P Paul Mundt

sh: Update kexec support for API changes.

This was falling a bit behind..
Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
上级 05ae9158
...@@ -29,12 +29,6 @@ extern const unsigned char relocate_new_kernel[]; ...@@ -29,12 +29,6 @@ extern const unsigned char relocate_new_kernel[];
extern const unsigned int relocate_new_kernel_size; extern const unsigned int relocate_new_kernel_size;
extern void *gdb_vbr_vector; 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) void machine_shutdown(void)
{ {
} }
......
...@@ -81,16 +81,6 @@ void cpu_idle(void) ...@@ -81,16 +81,6 @@ void cpu_idle(void)
void machine_restart(char * __unused) 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) */ /* SR.BL=1 and invoke address error to let CPU reset (manual reset) */
asm volatile("ldc %0, sr\n\t" asm volatile("ldc %0, sr\n\t"
"mov.l @%1, %0" : : "r" (0x10000000), "r" (0x80000001)); "mov.l @%1, %0" : : "r" (0x10000000), "r" (0x80000001));
......
...@@ -25,11 +25,8 @@ ...@@ -25,11 +25,8 @@
#define MAX_NOTE_BYTES 1024 #define MAX_NOTE_BYTES 1024
#ifndef __ASSEMBLY__ /* Provide a dummy definition to avoid build failures. */
static inline void crash_setup_regs(struct pt_regs *newregs,
extern void machine_shutdown(void); struct pt_regs *oldregs) { }
extern void *crash_notes;
#endif /* __ASSEMBLY__ */
#endif /* _SH_KEXEC_H */ #endif /* _SH_KEXEC_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册