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>

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);
         }