diff options
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 613644a758e8..036c3311233c 100644 --- a/arch/sh/include/asm/kprobes.h +++ b/arch/sh/include/asm/kprobes.h | |||
@@ -6,7 +6,7 @@ | |||
6 | #include <linux/types.h> | 6 | #include <linux/types.h> |
7 | #include <linux/ptrace.h> | 7 | #include <linux/ptrace.h> |
8 | 8 | ||
9 | typedef u16 kprobe_opcode_t; | 9 | typedef insn_size_t kprobe_opcode_t; |
10 | #define BREAKPOINT_INSTRUCTION 0xc33a | 10 | #define BREAKPOINT_INSTRUCTION 0xc33a |
11 | 11 | ||
12 | #define MAX_INSN_SIZE 16 | 12 | #define MAX_INSN_SIZE 16 |
diff --git a/arch/sh/include/asm/system_32.h b/arch/sh/include/asm/system_32.h index 240b31e1142c..6c68a51f1cc5 100644 --- a/arch/sh/include/asm/system_32.h +++ b/arch/sh/include/asm/system_32.h | |||
@@ -198,7 +198,7 @@ do { \ | |||
198 | }) | 198 | }) |
199 | #endif | 199 | #endif |
200 | 200 | ||
201 | int handle_unaligned_access(opcode_t instruction, struct pt_regs *regs, | 201 | int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs, |
202 | struct mem_access *ma); | 202 | struct mem_access *ma); |
203 | 203 | ||
204 | asmlinkage void do_address_error(struct pt_regs *regs, | 204 | 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 beea4e6f8dfd..b13caca62a76 100644 --- a/arch/sh/include/asm/types.h +++ b/arch/sh/include/asm/types.h | |||
@@ -23,9 +23,9 @@ typedef unsigned short umode_t; | |||
23 | typedef u32 dma_addr_t; | 23 | typedef u32 dma_addr_t; |
24 | 24 | ||
25 | #ifdef CONFIG_SUPERH32 | 25 | #ifdef CONFIG_SUPERH32 |
26 | typedef u16 opcode_t; | 26 | typedef u16 insn_size_t; |
27 | #else | 27 | #else |
28 | typedef u32 opcode_t; | 28 | typedef u32 insn_size_t; |
29 | #endif | 29 | #endif |
30 | 30 | ||
31 | #endif /* __ASSEMBLY__ */ | 31 | #endif /* __ASSEMBLY__ */ |