Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d549a7d authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Update kexec support for API changes. 



This was falling a bit behind..

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 05ae9158

arch/sh/kernel/machine_kexec.c

+0 −6
Original line number Diff line number Diff line
@@ -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)

{

}

arch/sh/kernel/process.c

+0 −10
Original line number Diff line number Diff line
@@ -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));

include/asm-sh/kexec.h

+3 −6
Original line number Diff line number Diff line
@@ -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 */