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:
parent
6dbe47a170
commit
2bcfffa423
7 changed files with 15 additions and 15 deletions
|
@ -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
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -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__ */
|
||||||
|
|
|
@ -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))
|
||||||
|
|
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -22,11 +22,11 @@ static void handle_BUG(struct pt_regs *regs)
|
||||||
|
|
||||||
int is_valid_bugaddr(unsigned long addr)
|
int is_valid_bugaddr(unsigned long addr)
|
||||||
{
|
{
|
||||||
unsigned short opcode;
|
insn_size_t opcode;
|
||||||
|
|
||||||
if (addr < PAGE_OFFSET)
|
if (addr < PAGE_OFFSET)
|
||||||
return 0;
|
return 0;
|
||||||
if (probe_kernel_address((u16 *)addr, opcode))
|
if (probe_kernel_address((insn_size_t *)addr, opcode))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
return opcode == TRAPA_BUG_OPCODE;
|
return opcode == TRAPA_BUG_OPCODE;
|
||||||
|
@ -66,7 +66,7 @@ BUILD_TRAP_HANDLER(bug)
|
||||||
|
|
||||||
#ifdef CONFIG_BUG
|
#ifdef CONFIG_BUG
|
||||||
if (__kernel_text_address(instruction_pointer(regs))) {
|
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)
|
if (insn == TRAPA_BUG_OPCODE)
|
||||||
handle_BUG(regs);
|
handle_BUG(regs);
|
||||||
}
|
}
|
||||||
|
|
|
@ -177,7 +177,7 @@ static struct mem_access user_mem_access = {
|
||||||
* (if that instruction is in a branch delay slot)
|
* (if that instruction is in a branch delay slot)
|
||||||
* - return 0 if emulation okay, -EFAULT on existential error
|
* - 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)
|
struct mem_access *ma)
|
||||||
{
|
{
|
||||||
int ret, index, count;
|
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
|
* - fetches the instruction from PC+2
|
||||||
*/
|
*/
|
||||||
static inline int handle_delayslot(struct pt_regs *regs,
|
static inline int handle_delayslot(struct pt_regs *regs,
|
||||||
opcode_t old_instruction,
|
insn_size_t old_instruction,
|
||||||
struct mem_access *ma)
|
struct mem_access *ma)
|
||||||
{
|
{
|
||||||
opcode_t instruction;
|
insn_size_t instruction;
|
||||||
void __user *addr = (void __user *)(regs->pc +
|
void __user *addr = (void __user *)(regs->pc +
|
||||||
instruction_size(old_instruction));
|
instruction_size(old_instruction));
|
||||||
|
|
||||||
|
@ -365,7 +365,7 @@ static inline int handle_delayslot(struct pt_regs *regs,
|
||||||
|
|
||||||
static int handle_unaligned_notify_count = 10;
|
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)
|
struct mem_access *ma)
|
||||||
{
|
{
|
||||||
u_int rm;
|
u_int rm;
|
||||||
|
@ -523,7 +523,7 @@ asmlinkage void do_address_error(struct pt_regs *regs,
|
||||||
unsigned long error_code = 0;
|
unsigned long error_code = 0;
|
||||||
mm_segment_t oldfs;
|
mm_segment_t oldfs;
|
||||||
siginfo_t info;
|
siginfo_t info;
|
||||||
opcode_t instruction;
|
insn_size_t instruction;
|
||||||
int tmp;
|
int tmp;
|
||||||
|
|
||||||
/* Intentional ifdef */
|
/* Intentional ifdef */
|
||||||
|
|
Reference in a new issue