1 files changed, 2 insertions, 19 deletions

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 794f364cb882..d1634c59ed56 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -46,23 +46,6 @@ kmmio_fault(struct pt_regs *regs, unsigned long addr)
         return 0;
 }
 
-static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
-{
-        if (!kprobes_built_in())
-                return 0;
-        if (user_mode(regs))
-                return 0;
-        /*
-         * To be potentially processing a kprobe fault and to be allowed to call
-         * kprobe_running(), we have to be non-preemptible.
-         */
-        if (preemptible())
-                return 0;
-        if (!kprobe_running())
-                return 0;
-        return kprobe_fault_handler(regs, X86_TRAP_PF);
-}
-
 /*
  * Prefetch quirks:
  *
@@ -1282,7 +1265,7 @@ do_kern_addr_fault(struct pt_regs *regs, unsigned long hw_error_code,
                 return;
 
         /* kprobes don't want to hook the spurious faults: */
-        if (kprobes_fault(regs))
+        if (kprobe_page_fault(regs, X86_TRAP_PF))
                 return;
 
         /*
@@ -1313,7 +1296,7 @@ void do_user_addr_fault(struct pt_regs *regs,
         mm = tsk->mm;
 
         /* kprobes don't want to hook the spurious faults: */
-        if (unlikely(kprobes_fault(regs)))
+        if (unlikely(kprobe_page_fault(regs, X86_TRAP_PF)))
                 return;
 
         /*