From f1290ec93e5da4a748ca4758a00b580283e06596 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sat, 16 Apr 2005 15:24:59 -0700 Subject: [PATCH] x86_64: Use a common function to find code segment bases To avoid some code duplication. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/x86_64/mm/fault.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'arch/x86_64/mm') diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c index d4676ca0914..e0330921676 100644 --- a/arch/x86_64/mm/fault.c +++ b/arch/x86_64/mm/fault.c @@ -62,21 +62,19 @@ void bust_spinlocks(int yes) static noinline int is_prefetch(struct pt_regs *regs, unsigned long addr, unsigned long error_code) { - unsigned char *instr = (unsigned char *)(regs->rip); + unsigned char *instr; int scan_more = 1; int prefetch = 0; - unsigned char *max_instr = instr + 15; + unsigned char *max_instr; /* If it was a exec fault ignore */ if (error_code & (1<<4)) return 0; - /* Code segments in LDT could have a non zero base. Don't check - when that's possible */ - if (regs->cs & (1<<2)) - return 0; + instr = (unsigned char *)convert_rip_to_linear(current, regs); + max_instr = instr + 15; - if ((regs->cs & 3) != 0 && regs->rip >= TASK_SIZE) + if ((regs->cs & 3) != 0 && instr >= (unsigned char *)TASK_SIZE) return 0; while (scan_more && instr < max_instr) { -- cgit v1.2.3-70-g09d2