From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Thu, 7 Feb 2013 21:35:42 +0000 (-0500)
Subject: dtrace: add support for an SDT probe getting called from multiple functions
X-Git-Tag: v4.1.12-92~313^2~90
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2094e387a18b0fe4453ff59e5346c3d6c0d4aef4;p=users%2Fjedix%2Flinux-maple.git

dtrace: add support for an SDT probe getting called from multiple functions

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
---

diff --git a/scripts/dtrace_sdt.sh b/scripts/dtrace_sdt.sh
index 8ec0aab76643..73a0d11814f6 100755
--- a/scripts/dtrace_sdt.sh
+++ b/scripts/dtrace_sdt.sh
@@ -139,8 +139,9 @@ lfn="$2"
 
 		 for (i = 1; i <= NF; i++) {
 		     prb = $i;
+		     pn = fun":"prb;
 
-		     print "\tPTR\t0x" addl(baseaddr, poffst[prb]);
+		     print "\tPTR\t0x" addl(baseaddr, poffst[pn]);
 		     print "\tPTR\t" length(prb);
 		     print "\tPTR\t" length(fun);
 		     print "\t.asciz\t\042" prb "\042";
@@ -165,9 +166,10 @@ lfn="$2"
 
 	 $3 == "R" {
 	     sub(/^0+/, "", $2);
+	     pn = fun":"$4;
 
 	     probes[fun] = $4 " " probes[fun];
-	     poffst[$4] = subl($2, addr);
+	     poffst[pn] = subl($2, addr);
 
 	     next;
 	 }