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>

1 files changed, 1 insertions, 11 deletions

diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index 8de82c8cedd6..7848bf74e2ab 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.