1 files changed, 2 insertions, 16 deletions

diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c
index 3093bc372138..5f51456f4fc7 100644
--- a/arch/sh/mm/fault.c
+++ b/arch/sh/mm/fault.c
@@ -24,20 +24,6 @@
 #include <asm/tlbflush.h>
 #include <asm/traps.h>
 
-static inline int notify_page_fault(struct pt_regs *regs, int trap)
-{
-        int ret = 0;
-
-        if (kprobes_built_in() && !user_mode(regs)) {
-                preempt_disable();
-                if (kprobe_running() && kprobe_fault_handler(regs, trap))
-                        ret = 1;
-                preempt_enable();
-        }
-
-        return ret;
-}
-
 static void
 force_sig_info_fault(int si_signo, int si_code, unsigned long address)
 {
@@ -412,14 +398,14 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
         if (unlikely(fault_in_kernel_space(address))) {
                 if (vmalloc_fault(address) >= 0)
                         return;
-                if (notify_page_fault(regs, vec))
+                if (kprobe_page_fault(regs, vec))
                         return;
 
                 bad_area_nosemaphore(regs, error_code, address);
                 return;
         }
 
-        if (unlikely(notify_page_fault(regs, vec)))
+        if (unlikely(kprobe_page_fault(regs, vec)))
                 return;
 
         /* Only enable interrupts if they were on before the fault */