From: Harvey Harrison Date: Wed, 30 Jan 2008 12:33:12 +0000 (+0100) Subject: x86: common x86_32|64 naming X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=37cd9cf3dafed82f7cf905785883300f6ff7c818;p=linux-beck.git x86: common x86_32|64 naming Rename convert_rip_to_linear to convert_ip_to_linear for shared X86_32|64 use. Signed-off-by: Harvey Harrison Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c index b801e76cebf7..80b37181a42b 100644 --- a/arch/x86/kernel/step.c +++ b/arch/x86/kernel/step.c @@ -89,7 +89,7 @@ unsigned long get_segment_eip(struct pt_regs *regs, #ifdef CONFIG_X86_32 static #endif -unsigned long convert_rip_to_linear(struct task_struct *child, struct pt_regs *regs) +unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs) { unsigned long addr, seg; @@ -136,7 +136,7 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs) { int i, copied; unsigned char opcode[15]; - unsigned long addr = convert_rip_to_linear(child, regs); + unsigned long addr = convert_ip_to_linear(child, regs); copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0); for (i = 0; i < copied; i++) { diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c index b92922a1d65f..b4d19c2d4f05 100644 --- a/arch/x86/mm/fault_32.c +++ b/arch/x86/mm/fault_32.c @@ -95,7 +95,7 @@ static int is_prefetch(struct pt_regs *regs, unsigned long addr, /* If it was a exec fault ignore */ if (error_code & PF_INSTR) return 0; - instr = (unsigned char __user *)convert_rip_to_linear(current, regs); + instr = (unsigned char __user *)convert_ip_to_linear(current, regs); #endif max_instr = instr + 15; diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c index cf7e99895b91..d519b41f1962 100644 --- a/arch/x86/mm/fault_64.c +++ b/arch/x86/mm/fault_64.c @@ -98,7 +98,7 @@ static int is_prefetch(struct pt_regs *regs, unsigned long addr, /* If it was a exec fault ignore */ if (error_code & PF_INSTR) return 0; - instr = (unsigned char __user *)convert_rip_to_linear(current, regs); + instr = (unsigned char __user *)convert_ip_to_linear(current, regs); #endif max_instr = instr + 15; diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h index cc4456667d89..35c103714906 100644 --- a/include/asm-x86/ptrace.h +++ b/include/asm-x86/ptrace.h @@ -177,7 +177,7 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where); struct task_struct; extern unsigned long -convert_rip_to_linear(struct task_struct *child, struct pt_regs *regs); +convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs); #endif /* __KERNEL__ */ #endif /* !__i386__ */