summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds2005-07-01 02:07:37 +0200
committerLinus Torvalds2005-07-01 02:07:37 +0200
commit62351cc38d3eaf3de0327054dd6ebc039f4da80d (patch)
tree4cd93660fe48a69272b18bf7b002366a6eb2fdea /include
parentMerge master.kernel.org:/home/rmk/linux-2.6-serial (diff)
parent[PATCH] ARM: 2780/1: AFS partition length calculation fix (diff)
downloadkernel-qcow2-linux-62351cc38d3eaf3de0327054dd6ebc039f4da80d.tar.gz
kernel-qcow2-linux-62351cc38d3eaf3de0327054dd6ebc039f4da80d.tar.xz
kernel-qcow2-linux-62351cc38d3eaf3de0327054dd6ebc039f4da80d.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
-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 *),