From 3de6f9683940419b990499f37651541facfa3c24 Mon Sep 17 00:00:00 2001
From: Jiang Liu <liuj97@gmail.com>
Date: Fri, 3 Feb 2012 15:37:16 -0800
Subject: [PATCH] --- yaml --- r: 287217 b: refs/heads/master c:
 55ca6140e9bb307efc97a9301a4f501de02a6fd6 h: refs/heads/master i:   287215:
 0a46735f59b9c46790e0307b14aafb1e9daeeed7 v: v3

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

diff --git a/[refs] b/[refs]
index cd57521b8c20..4edfcc73a577 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbcb8346054073d000ecac324763372d6abd44ac
+refs/heads/master: 55ca6140e9bb307efc97a9301a4f501de02a6fd6
diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c
index 29f5b65bee29..9788c0ec6f43 100644
--- a/trunk/kernel/kprobes.c
+++ b/trunk/kernel/kprobes.c
@@ -1673,8 +1673,12 @@ static int __kprobes pre_handler_kretprobe(struct kprobe *p,
 		ri->rp = rp;
 		ri->task = current;
 
-		if (rp->entry_handler && rp->entry_handler(ri, regs))
+		if (rp->entry_handler && rp->entry_handler(ri, regs)) {
+			raw_spin_lock_irqsave(&rp->lock, flags);
+			hlist_add_head(&ri->hlist, &rp->free_instances);
+			raw_spin_unlock_irqrestore(&rp->lock, flags);
 			return 0;
+		}
 
 		arch_prepare_kretprobe(ri, regs);