diff --git a/[refs] b/[refs]
index 8cb87822a671..cebb56d0fab1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c59e2942e92d2d776bcd038604a5c3c1d56d3ac
+refs/heads/master: 887f1ae3bc1701604a7b5ef145e1021072675444
diff --git a/trunk/arch/sh/mm/fault_32.c b/trunk/arch/sh/mm/fault_32.c
index 659811c179e6..ef01f45daa8a 100644
--- a/trunk/arch/sh/mm/fault_32.c
+++ b/trunk/arch/sh/mm/fault_32.c
@@ -21,26 +21,21 @@
 #include <asm/tlbflush.h>
 #include <asm/kgdb.h>
 
-#ifdef CONFIG_KPROBES
 static inline int notify_page_fault(struct pt_regs *regs, int trap)
 {
 	int ret = 0;
 
+#ifdef CONFIG_KPROBES
 	if (!user_mode(regs)) {
 		preempt_disable();
 		if (kprobe_running() && kprobe_fault_handler(regs, trap))
 			ret = 1;
 		preempt_enable();
 	}
+#endif
 
 	return ret;
 }
-#else
-static inline int notify_page_fault(struct pt_regs *regs, int trap)
-{
-	return 0;
-}
-#endif
 
 /*
  * This routine handles page faults.  It determines the address,
@@ -58,7 +53,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
 	int fault;
 	siginfo_t info;
 
-	if (notify_page_fault(regs, writeaccess))
+	if (notify_page_fault(regs, lookup_exception_vector()))
 		return;
 
 #ifdef CONFIG_SH_KGDB
@@ -293,7 +288,7 @@ asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs,
 	pte_t *pte;
 	pte_t entry;
 
-	if (notify_page_fault(regs, writeaccess))
+	if (notify_page_fault(regs, lookup_exception_vector()))
 		return 0;
 
 #ifdef CONFIG_SH_KGDB