system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-21 19:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: common x86_32|64 naming

Browse source 
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>
This commit is contained in:
Harvey Harrison 2008-01-30 13:33:12 +01:00 committed by Ingo Molnar
parent f13bd3e793
commit 37cd9cf3da
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/kernel/step.c
View file

@ -89,7 +89,7 @@ unsigned long get_segment_eip(struct pt_regs *regs,
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
static static
#endif #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; 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; int i, copied;
unsigned char opcode[15]; 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); copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
for (i = 0; i < copied; i++) { for (i = 0; i < copied; i++) {

2
arch/x86/mm/fault_32.c
View file

@ -95,7 +95,7 @@ static int is_prefetch(struct pt_regs *regs, unsigned long addr,
/* If it was a exec fault ignore */ /* If it was a exec fault ignore */
if (error_code & PF_INSTR) if (error_code & PF_INSTR)
return 0; return 0;
instr = (unsigned char __user *)convert_rip_to_linear(current, regs); instr = (unsigned char __user *)convert_ip_to_linear(current, regs);
#endif #endif
max_instr = instr + 15; max_instr = instr + 15;

2
arch/x86/mm/fault_64.c
View file

@ -98,7 +98,7 @@ static int is_prefetch(struct pt_regs *regs, unsigned long addr,
/* If it was a exec fault ignore */ /* If it was a exec fault ignore */
if (error_code & PF_INSTR) if (error_code & PF_INSTR)
return 0; return 0;
instr = (unsigned char __user *)convert_rip_to_linear(current, regs); instr = (unsigned char __user *)convert_ip_to_linear(current, regs);
#endif #endif
max_instr = instr + 15; max_instr = instr + 15;

2
include/asm-x86/ptrace.h
View file

@ -177,7 +177,7 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
struct task_struct; struct task_struct;
extern unsigned long 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 /* __KERNEL__ */
#endif /* !__i386__ */ #endif /* !__i386__ */