Skip to content

Commit

Permalink
sh: Update kexec support for API changes.
Browse files Browse the repository at this point in the history
This was falling a bit behind..

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Sep 27, 2006
1 parent 05ae915 commit 9d549a7
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 22 deletions.
6 changes: 0 additions & 6 deletions arch/sh/kernel/machine_kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
}
Expand Down
10 changes: 0 additions & 10 deletions arch/sh/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
9 changes: 3 additions & 6 deletions include/asm-sh/kexec.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 9d549a7

Please sign in to comment.