diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 20:07:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 20:07:37 -0400 |
| commit | 62351cc38d3eaf3de0327054dd6ebc039f4da80d (patch) | |
| tree | 4cd93660fe48a69272b18bf7b002366a6eb2fdea /include | |
| parent | d471cd4787351c05d6be749475418ccea2720ef4 (diff) | |
| parent | 747aead34de65c25765da79825ce2c08d8257b10 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/system.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index cdf49f442fd2..2f44b2044214 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h | |||
| @@ -85,7 +85,9 @@ struct pt_regs; | |||
| 85 | void die(const char *msg, struct pt_regs *regs, int err) | 85 | void die(const char *msg, struct pt_regs *regs, int err) |
| 86 | __attribute__((noreturn)); | 86 | __attribute__((noreturn)); |
| 87 | 87 | ||
| 88 | void die_if_kernel(const char *str, struct pt_regs *regs, int err); | 88 | struct siginfo; |
| 89 | void notify_die(const char *str, struct pt_regs *regs, struct siginfo *info, | ||
| 90 | unsigned long err, unsigned long trap); | ||
| 89 | 91 | ||
| 90 | void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int, | 92 | void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int, |
| 91 | struct pt_regs *), | 93 | struct pt_regs *), |