diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-05-09 16:02:08 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-09 16:02:08 +0900 |
| commit | 2bcfffa42309b6f73042c62459bf5207762a271d (patch) | |
| tree | 1e4801652658e815b4c873e951b6339037deb3d5 /arch/sh/kernel/traps.c | |
| parent | 6dbe47a170f80159f23c856ad4e02f2685c6f6cb (diff) | |
| download | linux-2bcfffa42309b6f73042c62459bf5207762a271d.tar.gz linux-2bcfffa42309b6f73042c62459bf5207762a271d.tar.bz2 linux-2bcfffa42309b6f73042c62459bf5207762a271d.zip | |
sh: Rename opcode_t to insn_size_t.
This is now clashing with a driver, so just rename it.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
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) int is_valid_bugaddr(unsigned long addr) { - unsigned short opcode; + insn_size_t opcode; if (addr < PAGE_OFFSET) return 0; - if (probe_kernel_address((u16 *)addr, opcode)) + if (probe_kernel_address((insn_size_t *)addr, opcode)) return 0; return opcode == TRAPA_BUG_OPCODE; @@ -66,7 +66,7 @@ BUILD_TRAP_HANDLER(bug) #ifdef CONFIG_BUG if (__kernel_text_address(instruction_pointer(regs))) { - opcode_t insn = *(opcode_t *)instruction_pointer(regs); + insn_size_t insn = *(insn_size_t *)instruction_pointer(regs); if (insn == TRAPA_BUG_OPCODE) handle_BUG(regs); } |