Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 101695
b: refs/heads/master
c: aee10c6
h: refs/heads/master
i:
  101693: ada20f8
  101691: 3681fd8
  101687: f53758a
  101679: b41bba5
  101663: 5db0e9a
  101631: ce916a4
v: v3
  • Loading branch information
Arnd Bergmann authored and Paul Mackerras committed Jun 30, 2008
1 parent 9f75639 commit a88e8af
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 41743a4e34f0777f51c1cf0675b91508ba143050
refs/heads/master: aee10c6145199f872bc51f811b115a4b686b2426
13 changes: 12 additions & 1 deletion trunk/include/asm-powerpc/kexec.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
#ifndef __ASSEMBLY__
#include <linux/cpumask.h>

typedef void (*crash_shutdown_t)(void);

#ifdef CONFIG_KEXEC

#ifdef __powerpc64__
Expand Down Expand Up @@ -123,7 +125,6 @@ struct pt_regs;
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);
typedef void (*crash_shutdown_t)(void);
extern int crash_shutdown_register(crash_shutdown_t handler);
extern int crash_shutdown_unregister(crash_shutdown_t handler);

Expand All @@ -143,6 +144,16 @@ static inline int overlaps_crashkernel(unsigned long start, unsigned long size)

static inline void reserve_crashkernel(void) { ; }

static inline int crash_shutdown_register(crash_shutdown_t handler)
{
return 0;
}

static inline int crash_shutdown_unregister(crash_shutdown_t handler)
{
return 0;
}

#endif /* CONFIG_KEXEC */
#endif /* ! __ASSEMBLY__ */
#endif /* __KERNEL__ */
Expand Down

0 comments on commit a88e8af

Please sign in to comment.