Commit 85f2adf1 authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar

x86: use helper in fault_64.c

Use the fixup_exception() helper in fault_64.c
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 6d48583b
...@@ -298,7 +298,6 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, ...@@ -298,7 +298,6 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
struct mm_struct *mm; struct mm_struct *mm;
struct vm_area_struct * vma; struct vm_area_struct * vma;
unsigned long address; unsigned long address;
const struct exception_table_entry *fixup;
int write, fault; int write, fault;
unsigned long flags; unsigned long flags;
siginfo_t info; siginfo_t info;
...@@ -508,9 +507,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, ...@@ -508,9 +507,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
no_context: no_context:
/* Are we prepared to handle this kernel fault? */ /* Are we prepared to handle this kernel fault? */
fixup = search_exception_tables(regs->ip); if (fixup_exception(regs)) {
if (fixup) {
regs->ip = fixup->fixup;
return; return;
} }
......
...@@ -65,6 +65,8 @@ struct exception_table_entry ...@@ -65,6 +65,8 @@ struct exception_table_entry
unsigned long insn, fixup; unsigned long insn, fixup;
}; };
extern int fixup_exception(struct pt_regs *regs);
#define ARCH_HAS_SEARCH_EXTABLE #define ARCH_HAS_SEARCH_EXTABLE
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment