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 46f026979fe4f58920780af2d6d530adfb99eded..79507d3929df48e14116c96389c86e4aa1b75adc 100644 (file)
--- 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 5afee49ef6cd2f9f73af77d873a9ddcc3b5af3cc..c05cee321090b39e5cb26a3d0e28279067f0d7be 100644 (file)
--- 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))