From 426b6836802dfbed1c8823bf6c2d8b283fef1626 Mon Sep 17 00:00:00 2001
From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Date: Thu, 20 Apr 2006 02:43:11 -0700
Subject: [PATCH] --- yaml --- r: 26039 b: refs/heads/master c:
 7522a8423bed9931cbac5502b9c0657bde2700ea h: refs/heads/master i:   26037:
 f48eda4682f79dc3b88910ad4831f8ff71925e76   26035:
 83e49cf977dbb34a2bec761a590eea2fd06f158c   26031:
 ae07693f1fa11ed26660d11e8378420ac47a8c15 v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/kprobes.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9e35ea89a936..7c9bb970535a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a7b46b369419493bab4de67b1526e9f76b22a7f
+refs/heads/master: 7522a8423bed9931cbac5502b9c0657bde2700ea
diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c
index 1156eb0977d0..1fbf466a29aa 100644
--- a/trunk/kernel/kprobes.c
+++ b/trunk/kernel/kprobes.c
@@ -585,6 +585,9 @@ int __kprobes register_kretprobe(struct kretprobe *rp)
 	int i;
 
 	rp->kp.pre_handler = pre_handler_kretprobe;
+	rp->kp.post_handler = NULL;
+	rp->kp.fault_handler = NULL;
+	rp->kp.break_handler = NULL;
 
 	/* Pre-allocate memory for max kretprobe instances */
 	if (rp->maxactive <= 0) {