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>
This commit is contained in:
@@ -177,7 +177,7 @@ static struct mem_access user_mem_access = {
|
||||
* (if that instruction is in a branch delay slot)
|
||||
* - return 0 if emulation okay, -EFAULT on existential error
|
||||
*/
|
||||
static int handle_unaligned_ins(opcode_t instruction, struct pt_regs *regs,
|
||||
static int handle_unaligned_ins(insn_size_t instruction, struct pt_regs *regs,
|
||||
struct mem_access *ma)
|
||||
{
|
||||
int ret, index, count;
|
||||
@@ -322,10 +322,10 @@ static int handle_unaligned_ins(opcode_t instruction, struct pt_regs *regs,
|
||||
* - fetches the instruction from PC+2
|
||||
*/
|
||||
static inline int handle_delayslot(struct pt_regs *regs,
|
||||
opcode_t old_instruction,
|
||||
insn_size_t old_instruction,
|
||||
struct mem_access *ma)
|
||||
{
|
||||
opcode_t instruction;
|
||||
insn_size_t instruction;
|
||||
void __user *addr = (void __user *)(regs->pc +
|
||||
instruction_size(old_instruction));
|
||||
|
||||
@@ -365,7 +365,7 @@ static inline int handle_delayslot(struct pt_regs *regs,
|
||||
|
||||
static int handle_unaligned_notify_count = 10;
|
||||
|
||||
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)
|
||||
{
|
||||
u_int rm;
|
||||
@@ -523,7 +523,7 @@ asmlinkage void do_address_error(struct pt_regs *regs,
|
||||
unsigned long error_code = 0;
|
||||
mm_segment_t oldfs;
|
||||
siginfo_t info;
|
||||
opcode_t instruction;
|
||||
insn_size_t instruction;
|
||||
int tmp;
|
||||
|
||||
/* Intentional ifdef */
|
||||
|
Reference in New Issue
Block a user