diff options
Diffstat (limited to 'arch/sh/kernel/traps.c')
| -rw-r--r-- | arch/sh/kernel/traps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index 7b036339dc92..0830c2a9f712 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c | |||
| @@ -58,7 +58,7 @@ BUILD_TRAP_HANDLER(debug) | |||
| 58 | TRAP_HANDLER_DECL; | 58 | TRAP_HANDLER_DECL; |
| 59 | 59 | ||
| 60 | /* Rewind */ | 60 | /* Rewind */ |
| 61 | regs->pc -= instruction_size(ctrl_inw(regs->pc - 4)); | 61 | regs->pc -= instruction_size(__raw_readw(regs->pc - 4)); |
| 62 | 62 | ||
| 63 | if (notify_die(DIE_TRAP, "debug trap", regs, 0, vec & 0xff, | 63 | if (notify_die(DIE_TRAP, "debug trap", regs, 0, vec & 0xff, |
| 64 | SIGTRAP) == NOTIFY_STOP) | 64 | SIGTRAP) == NOTIFY_STOP) |
| @@ -75,7 +75,7 @@ BUILD_TRAP_HANDLER(bug) | |||
| 75 | TRAP_HANDLER_DECL; | 75 | TRAP_HANDLER_DECL; |
| 76 | 76 | ||
| 77 | /* Rewind */ | 77 | /* Rewind */ |
| 78 | regs->pc -= instruction_size(ctrl_inw(regs->pc - 4)); | 78 | regs->pc -= instruction_size(__raw_readw(regs->pc - 4)); |
| 79 | 79 | ||
| 80 | if (notify_die(DIE_TRAP, "bug trap", regs, 0, TRAPA_BUG_OPCODE & 0xff, | 80 | if (notify_die(DIE_TRAP, "bug trap", regs, 0, TRAPA_BUG_OPCODE & 0xff, |
| 81 | SIGTRAP) == NOTIFY_STOP) | 81 | SIGTRAP) == NOTIFY_STOP) |