diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-01-30 13:31:41 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:31:41 +0100 |
| commit | 6d48583ba9ade609634e694fc35ea62b7a8adaaa (patch) | |
| tree | bc6e3bec5359b9136a8e53a9dbe80d71f9795f6b /arch/x86/kernel/kprobes.c | |
| parent | 46265df040533f57c191bb2b019d6b25c3bf1f34 (diff) | |
x86: unify extable_{32|64}.c
Introduce fixup_exception() on 64-bit and use it in kprobes to
eliminate an #ifdef.
Only 64-bit needs search_extable() due to a stepping bug.
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/x86/kernel/kprobes.c')
| -rw-r--r-- | arch/x86/kernel/kprobes.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c index 8de82c8cedd..7848bf74e2a 100644 --- a/arch/x86/kernel/kprobes.c +++ b/arch/x86/kernel/kprobes.c @@ -904,19 +904,9 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) * In case the user-specified fault handler returned * zero, try to fix up. */ -#ifdef CONFIG_X86_64 - { - const struct exception_table_entry *fixup; - fixup = search_exception_tables(regs->ip); - if (fixup) { - regs->ip = fixup->fixup; - return 1; - } - } -#else if (fixup_exception(regs)) return 1; -#endif + /* * fixup routine could not handle it, * Let do_page_fault() fix it. |