aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-01-30 13:33:12 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:33:12 +0100
commit37cd9cf3dafed82f7cf905785883300f6ff7c818 (patch)
treef1ec07a057955f71729d99318792e134f98f9264 /arch
parentf13bd3e7935f7020f7c622bf3f8cae8eee757a53 (diff)
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')
-rw-r--r--arch/x86/kernel/step.c4
-rw-r--r--arch/x86/mm/fault_32.c2
-rw-r--r--arch/x86/mm/fault_64.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
index b801e76cebf..80b37181a42 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 b92922a1d65..b4d19c2d4f0 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 cf7e99895b9..d519b41f196 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;