diff --git a/[refs] b/[refs]
index 407daacb0edb..043cbd6f12dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 174b5c9923e0170c844e03d55a9f3fb3b329a8b7
+refs/heads/master: ee386de77419f9fedf206d84c4d4b2de0ead5bcb
diff --git a/trunk/arch/sh/kernel/kprobes.c b/trunk/arch/sh/kernel/kprobes.c
index fdd049e9ad86..75accf9b4209 100644
--- a/trunk/arch/sh/kernel/kprobes.c
+++ b/trunk/arch/sh/kernel/kprobes.c
@@ -474,7 +474,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
 				ret = NOTIFY_STOP;
 			} else {
 				/* Not a kprobe trap */
-				force_sig(SIGTRAP, current);
+				ret = NOTIFY_DONE;
 			}
 		} else {
 			p = get_kprobe(addr);