Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bcfffa4 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Rename opcode_t to insn_size_t. 



This is now clashing with a driver, so just rename it.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 6dbe47a1

arch/sh/include/asm/kprobes.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <linux/types.h>

#include <linux/types.h>

#include <linux/ptrace.h>

#include <linux/ptrace.h>





typedef u16 kprobe_opcode_t;

typedef insn_size_t kprobe_opcode_t;

#define BREAKPOINT_INSTRUCTION	0xc33a

#define BREAKPOINT_INSTRUCTION	0xc33a





#define MAX_INSN_SIZE 16

#define MAX_INSN_SIZE 16

arch/sh/include/asm/system_32.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -198,7 +198,7 @@ do { \ 
})

})

#endif

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

			    struct mem_access *ma);





asmlinkage void do_address_error(struct pt_regs *regs,

asmlinkage void do_address_error(struct pt_regs *regs,

arch/sh/include/asm/types.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -23,9 +23,9 @@ typedef unsigned short umode_t; 
typedef u32 dma_addr_t;

typedef u32 dma_addr_t;





#ifdef CONFIG_SUPERH32

#ifdef CONFIG_SUPERH32

typedef u16 opcode_t;

typedef u16 insn_size_t;

#else

#else

typedef u32 opcode_t;

typedef u32 insn_size_t;

#endif

#endif





#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLY__ */

arch/sh/kernel/io_trapped.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -267,7 +267,7 @@ static struct mem_access trapped_io_access = { 
int handle_trapped_io(struct pt_regs *regs, unsigned long address)

int handle_trapped_io(struct pt_regs *regs, unsigned long address)

{

{

	mm_segment_t oldfs;

	mm_segment_t oldfs;

	opcode_t instruction;

	insn_size_t instruction;

	int tmp;

	int tmp;





	if (!lookup_tiop(address))

	if (!lookup_tiop(address))

arch/sh/kernel/kgdb.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ char in_nmi = 0; /* Set during NMI to prevent re-entry */ 
/* Calculate the new address for after a step */

/* Calculate the new address for after a step */

static short *get_step_address(struct pt_regs *linux_regs)

static short *get_step_address(struct pt_regs *linux_regs)

{

{

	opcode_t op = __raw_readw(linux_regs->pc);

	insn_size_t op = __raw_readw(linux_regs->pc);

	long addr;

	long addr;





	/* BT */

	/* BT */
@@ -134,7 +134,7 @@ static short *get_step_address(struct pt_regs *linux_regs) 
 */

 */





static unsigned long stepped_address;

static unsigned long stepped_address;

static opcode_t stepped_opcode;

static insn_size_t stepped_opcode;





static void do_single_step(struct pt_regs *linux_regs)

static void do_single_step(struct pt_regs *linux_regs)

{

{