From dcc1d6d9fc881a194cad4b8b9cb372377c072029 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <mhiramat@redhat.com>
Date: Wed, 30 Jan 2008 13:32:01 +0100
Subject: [PATCH] --- yaml --- r: 80088 b: refs/heads/master c:
 ddc66df876fd33d3956f3c3acc1ae334b16eedee h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8d63c7d5a68e..d3ca6506439d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bde6f5f59c2b2b48a7a849c129d5b48838fe77ee
+refs/heads/master: ddc66df876fd33d3956f3c3acc1ae334b16eedee
diff --git a/trunk/arch/x86/kernel/kprobes.c b/trunk/arch/x86/kernel/kprobes.c
index 521a469acaad..f0f2b98b9e20 100644
--- a/trunk/arch/x86/kernel/kprobes.c
+++ b/trunk/arch/x86/kernel/kprobes.c
@@ -467,7 +467,8 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
 				arch_disarm_kprobe(p);
 				regs->ip = (unsigned long)p->addr;
 				reset_current_kprobe();
-				return 1;
+				ret = 1;
+				goto no_kprobe;
 #endif
 			}
 			/* We have reentered the kprobe_handler(), since