1 files changed, 2 insertions, 21 deletions

diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index d989592b6fc8..8432c281de92 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -42,26 +42,6 @@
 #include <asm/debug.h>
 #include <asm/kup.h>
 
-static inline bool notify_page_fault(struct pt_regs *regs)
-{
-        bool ret = false;
-
-#ifdef CONFIG_KPROBES
-        /* kprobe_running() needs smp_processor_id() */
-        if (!user_mode(regs)) {
-                preempt_disable();
-                if (kprobe_running() && kprobe_fault_handler(regs, 11))
-                        ret = true;
-                preempt_enable();
-        }
-#endif /* CONFIG_KPROBES */
-
-        if (unlikely(debugger_fault_handler(regs)))
-                ret = true;
-
-        return ret;
-}
-
 /*
  * Check whether the instruction inst is a store using
  * an update addressing form which will update r1.
@@ -461,8 +441,9 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address,
         int is_write = page_fault_is_write(error_code);
         vm_fault_t fault, major = 0;
         bool must_retry = false;
+        bool kprobe_fault = kprobe_page_fault(regs, 11);
 
-        if (notify_page_fault(regs))
+        if (unlikely(debugger_fault_handler(regs) || kprobe_fault))
                 return 0;
 
         if (unlikely(page_fault_is_bad(error_code))) {