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

Commit 39931e41 authored by Albert Herranz's avatar Albert Herranz Committed by Linus Torvalds
Browse files

[PATCH] powerpc: fix for kexec ppc32 



- kexec.h is included from assembly code, thus C code must be properly
  protected.

- (embedded) ppc32 systems use machine_kexec_simple whose declaration
  vanished during a recent powerpc merge change.

Signed-off-by: default avatarAlbert Herranz <albert_herranz@yahoo.es>
Cc: <fastboot@osdl.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9ac49d22

include/asm-powerpc/kexec.h

+3 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


#ifdef CONFIG_KEXEC



#ifndef __ASSEMBLY__

#ifdef __powerpc64__

/*

 * This function is responsible for capturing register states if coming
@@ -104,7 +105,6 @@ static inline void crash_setup_regs(struct pt_regs *newregs, 
					struct pt_regs *oldregs) { }

#endif /* !__powerpc64 __ */



#ifndef __ASSEMBLY__

#define MAX_NOTE_BYTES 1024



#ifdef __powerpc64__
@@ -121,6 +121,8 @@ extern void default_machine_kexec(struct kimage *image); 
extern int default_machine_kexec_prepare(struct kimage *image);

extern void default_machine_crash_shutdown(struct pt_regs *regs);



extern void machine_kexec_simple(struct kimage *image);



#endif /* ! __ASSEMBLY__ */

#endif /* CONFIG_KEXEC */

#endif /* __KERNEL__ */