From: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
Date: Fri, 4 Apr 2014 13:54:56 +0000 (+0400)
Subject: [FIX] optimize nested call US instrumentation
X-Git-Tag: Tizen_SDK_2.3~94
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F50%2F19050%2F2;p=kernel%2Fswap-modules.git

[FIX] optimize nested call US instrumentation

Change-Id: Ie63b7175621a6b0cf3186f0a598ff5b874ed9e31
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
---

diff --git a/uprobe/swap_uprobes.c b/uprobe/swap_uprobes.c
index 8fadb5e..393811f 100644
--- a/uprobe/swap_uprobes.c
+++ b/uprobe/swap_uprobes.c
@@ -655,7 +655,7 @@ int trampoline_uprobe_handler(struct kprobe *p, struct pt_regs *regs)
 		orig_ret_addr = (unsigned long)ri->ret_addr;
 		recycle_urp_inst(ri);
 
-		if (orig_ret_addr != tramp_addr) {
+		if (orig_ret_addr != tramp_addr && &ri->rp->up.kp == p) {
 			/*
 			 * This is the real return address. Any other
 			 * instances associated with this task are for