diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-06 15:35:18 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-06 15:35:18 -0700 |
| commit | 67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch) | |
| tree | a96c26a370beb23282a561ddd936e5d0aa93adde /arch/arm/kernel/traps.c | |
| parent | 2ba3e3e65cf182436757ba13ea8d564e2950fb56 (diff) | |
| parent | 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 (diff) | |
| download | talos-obmc-linux-67d340f440f389e9d56201fb7c7aaa92f262feb1.tar.gz talos-obmc-linux-67d340f440f389e9d56201fb7c7aaa92f262feb1.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/kernel/traps.c')
| -rw-r--r-- | arch/arm/kernel/traps.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 2fb0a4cfb37a..df2cb06ce424 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -230,16 +230,8 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err) do_exit(SIGSEGV); } -void die_if_kernel(const char *str, struct pt_regs *regs, int err) -{ - if (user_mode(regs)) - return; - - die(str, regs, err); -} - -static void notify_die(const char *str, struct pt_regs *regs, siginfo_t *info, - unsigned long err, unsigned long trap) +void notify_die(const char *str, struct pt_regs *regs, struct siginfo *info, + unsigned long err, unsigned long trap) { if (user_mode(regs)) { current->thread.error_code = err; |
