From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Wed, 28 Aug 2013 22:19:59 +0000 (-0400)
Subject: dtrace: Fix frame offsets for direct called probes (ERROR and syscalls).
X-Git-Tag: v4.1.12-111.0.20170907_2225~3^2~3^2~131
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=20ad2ac52aea8bd986051b162439ab7ca77b089f;p=users%2Fjedix%2Flinux-maple.git

dtrace: Fix frame offsets for direct called probes (ERROR and syscalls).

Orabug: 17368166

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

diff --git a/dtrace/dtrace_dev.c b/dtrace/dtrace_dev.c
index 46f026979fe4f..79507d3929df4 100644
--- a/dtrace/dtrace_dev.c
+++ b/dtrace/dtrace_dev.c
@@ -1466,7 +1466,7 @@ int dtrace_dev_init(void)
 				NULL, "END", 0, NULL);
 	dtrace_probeid_error = dtrace_probe_create(
 				(dtrace_provider_id_t)dtrace_provider, NULL,
-				NULL, "ERROR", 1, NULL);
+				NULL, "ERROR", 0, NULL);
 
 	dtrace_anon_property();
 	mutex_unlock(&cpu_lock);
diff --git a/dtrace/systrace_dev.c b/dtrace/systrace_dev.c
index 5afee49ef6cd2..c05cee321090b 100644
--- a/dtrace/systrace_dev.c
+++ b/dtrace/systrace_dev.c
@@ -33,7 +33,7 @@
 #include "dtrace_dev.h"
 #include "systrace.h"
 
-#define SYSTRACE_ARTIFICIAL_FRAMES	1
+#define SYSTRACE_ARTIFICIAL_FRAMES	0
 
 #define SYSTRACE_SHIFT			16
 #define SYSTRACE_ENTRY(id)		((1 << SYSTRACE_SHIFT) | (id))