diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-01-30 13:33:12 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:12 +0100 |
commit | 37cd9cf3dafed82f7cf905785883300f6ff7c818 (patch) | |
tree | f1ec07a057955f71729d99318792e134f98f9264 /arch/x86/mm | |
parent | x86: use wrmsrl in kprobes.c, step.c (diff) | |
download | linux-37cd9cf3dafed82f7cf905785883300f6ff7c818.tar.xz linux-37cd9cf3dafed82f7cf905785883300f6ff7c818.zip |
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 <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/fault_32.c | 2 | ||||
-rw-r--r-- | arch/x86/mm/fault_64.c | 2 |
2 files changed, 2 insertions, 2 deletions
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; |