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/include | |
| parent | 6dbe47a170f80159f23c856ad4e02f2685c6f6cb (diff) | |
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/include')
| -rw-r--r-- | arch/sh/include/asm/kprobes.h | 2 | ||||
| -rw-r--r-- | arch/sh/include/asm/system_32.h | 2 | ||||
| -rw-r--r-- | arch/sh/include/asm/types.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/include/asm/kprobes.h b/arch/sh/include/asm/kprobes.h index 613644a758e..036c3311233 100644 --- a/arch/sh/include/asm/kprobes.h +++ b/arch/sh/include/asm/kprobes.h @@ -6,7 +6,7 @@ #include <linux/types.h> #include <linux/ptrace.h> -typedef u16 kprobe_opcode_t; +typedef insn_size_t kprobe_opcode_t; #define BREAKPOINT_INSTRUCTION 0xc33a #define MAX_INSN_SIZE 16 diff --git a/arch/sh/include/asm/system_32.h b/arch/sh/include/asm/system_32.h index 240b31e1142..6c68a51f1cc 100644 --- a/arch/sh/include/asm/system_32.h +++ b/arch/sh/include/asm/system_32.h @@ -198,7 +198,7 @@ do { \ }) #endif -int handle_unaligned_access(opcode_t instruction, struct pt_regs *regs, +int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs, struct mem_access *ma); asmlinkage void do_address_error(struct pt_regs *regs, diff --git a/arch/sh/include/asm/types.h b/arch/sh/include/asm/types.h index beea4e6f8df..b13caca62a7 100644 --- a/arch/sh/include/asm/types.h +++ b/arch/sh/include/asm/types.h @@ -23,9 +23,9 @@ typedef unsigned short umode_t; typedef u32 dma_addr_t; #ifdef CONFIG_SUPERH32 -typedef u16 opcode_t; +typedef u16 insn_size_t; #else -typedef u32 opcode_t; +typedef u32 insn_size_t; #endif #endif /* __ASSEMBLY__ */ |