From: Harvey Harrison <harvey.harrison@gmail.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: LKML <linux-kernel@vger.kernel.org>,
"H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH] x86: common x86_32|64 naming
Date: Fri, 11 Jan 2008 14:24:17 -0800 [thread overview]
Message-ID: <1200090257.19760.55.camel@brick> (raw)
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>
---
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 5884dd4..923aee6 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 f8fc240..f0bbcab 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 11e9398..7dedb6b 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__ */
--
1.5.4.rc2.1164.g6451
reply other threads:[~2008-01-11 22:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1200090257.19760.55.camel@brick \
--to=harvey.harrison@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox