Skip to content

Commit

Permalink
[PATCH] powerpc: fix for kexec ppc32
Browse files Browse the repository at this point in the history
- 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: Albert 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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Albert Herranz authored and Linus Torvalds committed Feb 1, 2006
1 parent 9ac49d2 commit 39931e4
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion include/asm-powerpc/kexec.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

#ifdef CONFIG_KEXEC

#ifndef __ASSEMBLY__
#ifdef __powerpc64__
/*
* This function is responsible for capturing register states if coming
Expand Down Expand Up @@ -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__
Expand All @@ -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__ */
Expand Down

0 comments on commit 39931e4

Please sign in to comment.