summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/system.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-07-14 01:11:44 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-07-14 01:11:44 +0200
commit08cd84c81f27d5bd22ba958b7cae6d566c509280 (patch)
tree6fdb546c151410851fd3c604d42590afa4215084 /include/asm-arm/system.h
parentMerge /spare/repo/netdev-2.6 branch 'ieee80211' (diff)
parentMerge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6. (diff)
downloadlinux-08cd84c81f27d5bd22ba958b7cae6d566c509280.tar.xz
linux-08cd84c81f27d5bd22ba958b7cae6d566c509280.zip
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'include/asm-arm/system.h')
-rw-r--r--include/asm-arm/system.h4
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;
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 *),