diff options
Diffstat (limited to 'arch/sh/kernel/traps.c')
| -rw-r--r-- | arch/sh/kernel/traps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index 438f1ebcc453..46348ed07cc3 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c | |||
| @@ -22,11 +22,11 @@ static void handle_BUG(struct pt_regs *regs) | |||
| 22 | 22 | ||
| 23 | int is_valid_bugaddr(unsigned long addr) | 23 | int is_valid_bugaddr(unsigned long addr) |
| 24 | { | 24 | { |
| 25 | unsigned short opcode; | 25 | insn_size_t opcode; |
| 26 | 26 | ||
| 27 | if (addr < PAGE_OFFSET) | 27 | if (addr < PAGE_OFFSET) |
| 28 | return 0; | 28 | return 0; |
| 29 | if (probe_kernel_address((u16 *)addr, opcode)) | 29 | if (probe_kernel_address((insn_size_t *)addr, opcode)) |
| 30 | return 0; | 30 | return 0; |
| 31 | 31 | ||
| 32 | return opcode == TRAPA_BUG_OPCODE; | 32 | return opcode == TRAPA_BUG_OPCODE; |
| @@ -66,7 +66,7 @@ BUILD_TRAP_HANDLER(bug) | |||
| 66 | 66 | ||
| 67 | #ifdef CONFIG_BUG | 67 | #ifdef CONFIG_BUG |
| 68 | if (__kernel_text_address(instruction_pointer(regs))) { | 68 | if (__kernel_text_address(instruction_pointer(regs))) { |
| 69 | opcode_t insn = *(opcode_t *)instruction_pointer(regs); | 69 | insn_size_t insn = *(insn_size_t *)instruction_pointer(regs); |
| 70 | if (insn == TRAPA_BUG_OPCODE) | 70 | if (insn == TRAPA_BUG_OPCODE) |
| 71 | handle_BUG(regs); | 71 | handle_BUG(regs); |
| 72 | } | 72 | } |
