diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-05-08 21:55:38 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-05-08 21:55:38 -0400 |
commit | b118ca572db5af832c6fc1af7b301105378d1a08 (patch) | |
tree | f312b3f0f863b56add106efdf091d1f51447a0d0 /arch/sh/kernel/process.c | |
parent | 21ec4c6453790cb9bfa996ab8f27f22dd47c516a (diff) |
sh: Convert to common die chain.
This went in immediately after SH added the die chain notifiers,
so move over to that instead..
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/process.c')
-rw-r--r-- | arch/sh/kernel/process.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c index 9005b2f12aaa..d755589ba8b1 100644 --- a/arch/sh/kernel/process.c +++ b/arch/sh/kernel/process.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <linux/pm.h> | 15 | #include <linux/pm.h> |
16 | #include <linux/kallsyms.h> | 16 | #include <linux/kallsyms.h> |
17 | #include <linux/kexec.h> | 17 | #include <linux/kexec.h> |
18 | #include <asm/kdebug.h> | 18 | #include <linux/kdebug.h> |
19 | #include <asm/uaccess.h> | 19 | #include <asm/uaccess.h> |
20 | #include <asm/mmu_context.h> | 20 | #include <asm/mmu_context.h> |
21 | #include <asm/pgalloc.h> | 21 | #include <asm/pgalloc.h> |
@@ -500,7 +500,7 @@ asmlinkage void debug_trap_handler(unsigned long r4, unsigned long r5, | |||
500 | /* Rewind */ | 500 | /* Rewind */ |
501 | regs->pc -= instruction_size(ctrl_inw(regs->pc - 4)); | 501 | regs->pc -= instruction_size(ctrl_inw(regs->pc - 4)); |
502 | 502 | ||
503 | if (notify_die(DIE_TRAP, regs, regs->tra & 0xff, | 503 | if (notify_die(DIE_TRAP, "debug trap", regs, 0, regs->tra & 0xff, |
504 | SIGTRAP) == NOTIFY_STOP) | 504 | SIGTRAP) == NOTIFY_STOP) |
505 | return; | 505 | return; |
506 | 506 | ||
@@ -519,7 +519,7 @@ asmlinkage void bug_trap_handler(unsigned long r4, unsigned long r5, | |||
519 | /* Rewind */ | 519 | /* Rewind */ |
520 | regs->pc -= instruction_size(ctrl_inw(regs->pc - 4)); | 520 | regs->pc -= instruction_size(ctrl_inw(regs->pc - 4)); |
521 | 521 | ||
522 | if (notify_die(DIE_TRAP, regs, TRAPA_BUG_OPCODE & 0xff, | 522 | if (notify_die(DIE_TRAP, "bug trap", regs, 0, TRAPA_BUG_OPCODE & 0xff, |
523 | SIGTRAP) == NOTIFY_STOP) | 523 | SIGTRAP) == NOTIFY_STOP) |
524 | return; | 524 | return; |
525 | 525 | ||