From 20ad2ac52aea8bd986051b162439ab7ca77b089f Mon Sep 17 00:00:00 2001 From: Kris Van Hees Date: Wed, 28 Aug 2013 18:19:59 -0400 Subject: [PATCH] dtrace: Fix frame offsets for direct called probes (ERROR and syscalls). Orabug: 17368166 Signed-off-by: Kris Van Hees --- dtrace/dtrace_dev.c | 2 +- dtrace/systrace_dev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dtrace/dtrace_dev.c b/dtrace/dtrace_dev.c index 46f026979fe4..79507d3929df 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 5afee49ef6cd..c05cee321090 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)) -- 2.50.1