diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 17:07:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 17:07:37 -0700 |
| commit | 62351cc38d3eaf3de0327054dd6ebc039f4da80d (patch) | |
| tree | 4cd93660fe48a69272b18bf7b002366a6eb2fdea /include | |
| parent | d471cd4787351c05d6be749475418ccea2720ef4 (diff) | |
| parent | 747aead34de65c25765da79825ce2c08d8257b10 (diff) | |
| download | op-kernel-dev-62351cc38d3eaf3de0327054dd6ebc039f4da80d.zip op-kernel-dev-62351cc38d3eaf3de0327054dd6ebc039f4da80d.tar.gz | |
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 cdf49f4..2f44b20 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h @@ -85,7 +85,9 @@ struct pt_regs; void die(const char *msg, struct pt_regs *regs, int err) __attribute__((noreturn)); -void die_if_kernel(const char *str, struct pt_regs *regs, int err); +struct siginfo; +void notify_die(const char *str, struct pt_regs *regs, struct siginfo *info, + unsigned long err, unsigned long trap); void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *), |
