diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-07 06:08:27 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-07-07 06:08:27 -0400 |
commit | 717cb906bd43a9ac00631d600adda5c6546843a6 (patch) | |
tree | f41b250e9e0fa1e664f002fa9c4608d94527f2f2 /arch/arm/kernel/traps.c | |
parent | 22f579c621e2f264e6d093b07d75f99bc97d5df2 (diff) | |
parent | c101f3136cc98a003d0d16be6fab7d0d950581a6 (diff) |
Merge ../linux-2.6/
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) | |||
230 | do_exit(SIGSEGV); | 230 | do_exit(SIGSEGV); |
231 | } | 231 | } |
232 | 232 | ||
233 | void die_if_kernel(const char *str, struct pt_regs *regs, int err) | 233 | void notify_die(const char *str, struct pt_regs *regs, struct siginfo *info, |
234 | { | 234 | unsigned long err, unsigned long trap) |
235 | if (user_mode(regs)) | ||
236 | return; | ||
237 | |||
238 | die(str, regs, err); | ||
239 | } | ||
240 | |||
241 | static void notify_die(const char *str, struct pt_regs *regs, siginfo_t *info, | ||
242 | unsigned long err, unsigned long trap) | ||
243 | { | 235 | { |
244 | if (user_mode(regs)) { | 236 | if (user_mode(regs)) { |
245 | current->thread.error_code = err; | 237 | current->thread.error_code = err; |