From 3646cba63af9c2bbf78d22d7fde27caaadc71ceb Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 8 Sep 2008 18:12:33 +0900
Subject: [PATCH] --- yaml --- r: 116106 b: refs/heads/master c:
 ee386de77419f9fedf206d84c4d4b2de0ead5bcb h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/sh/kernel/kprobes.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);