adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-03 14:43:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

sh: Update kexec support for API changes.

Browse source 
This was falling a bit behind..

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2006-09-27 18:26:05 +09:00
parent 05ae915851
commit 9d549a7d8e
3 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/sh/kernel/machine_kexec.c
View file

@ -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)
{ {
} }

10
arch/sh/kernel/process.c
View file

@ -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));

9
include/asm-sh/kexec.h
View file

@ -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 */