[PATCH 2.6.16-rc1] powerpc: fix for kexec ppc32

From: Albert Herranz
Date: Tue Jan 17 2006 - 14:17:56 EST


Hi,

Signed-off-by: Albert Herranz
<albert_herranz@xxxxxxxx>

The following patch fixes kexec on ppc32.
o kexec.h is included from assembly code, thus C code
must be properly protected.
o (embedded) ppc32 systems use machine_kexec_simple
whose declaration vanished during a recent powerpc
merge change.

Cheers,
Albert






______________________________________________
LLama Gratis a cualquier PC del Mundo.
Llamadas a fijos y móviles desde 1 céntimo por minuto.
http://es.voice.yahoo.com--- a/include/asm-powerpc/kexec.h 2006-01-17 19:08:34.000000000 +0100
+++ b/include/asm-powerpc/kexec.h 2006-01-17 19:10:45.000000000 +0100
@@ -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(stru
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
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__ */