Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=37cd9cf3dafed82f7cf905785883300f6ff7c818 Commit: 37cd9cf3dafed82f7cf905785883300f6ff7c818 Parent: f13bd3e7935f7020f7c622bf3f8cae8eee757a53 Author: Harvey Harrison <[EMAIL PROTECTED]> AuthorDate: Wed Jan 30 13:33:12 2008 +0100 Committer: Ingo Molnar <[EMAIL PROTECTED]> CommitDate: Wed Jan 30 13:33:12 2008 +0100
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 <[EMAIL PROTECTED]> Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]> Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]> --- arch/x86/kernel/step.c | 4 ++-- arch/x86/mm/fault_32.c | 2 +- arch/x86/mm/fault_64.c | 2 +- include/asm-x86/ptrace.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c index b801e76..80b3718 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 b92922a..b4d19c2 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 cf7e998..d519b41 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 cc44566..35c1037 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__ */ - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html