summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorMark Wielaard <mjw@redhat.com>2009-04-15 19:20:56 +0200
committerMark Wielaard <mjw@redhat.com>2009-04-15 19:20:56 +0200
commit7c2136cfc88d68cfc5eb490444dc25c7dc1c0632 (patch)
tree3a99bf80ba62a010f696c4fc421f1aaa31a51a36 /runtime
parent9a8911ac796aa9cefb504b825802246ef3c8e45f (diff)
parentf38b2e7385b3395dc589af5bde137971adf84f27 (diff)
downloadsystemtap-steved-7c2136cfc88d68cfc5eb490444dc25c7dc1c0632.tar.gz
systemtap-steved-7c2136cfc88d68cfc5eb490444dc25c7dc1c0632.tar.xz
systemtap-steved-7c2136cfc88d68cfc5eb490444dc25c7dc1c0632.zip
Merge branch 'dwarf_unwinder'
Diffstat (limited to 'runtime')
-rw-r--r--runtime/runtime.h14
-rw-r--r--runtime/unwind.c2
2 files changed, 8 insertions, 8 deletions
diff --git a/runtime/runtime.h b/runtime/runtime.h
index 0a656b78..c2e927cc 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -66,6 +66,13 @@ static struct
#define MAXTRACE 20
#endif
+/* dwarf unwinder only tested so far on i386 and x86_64. */
+#if (defined(__i386__) || defined(__x86_64__))
+#ifndef STP_USE_DWARF_UNWINDER
+#define STP_USE_DWARF_UNWINDER
+#endif
+#endif
+
#ifdef CONFIG_FRAME_POINTER
/* Just because frame pointers are available does not mean we can trust them. */
#ifndef STP_USE_DWARF_UNWINDER
@@ -73,13 +80,6 @@ static struct
#endif
#endif
-/* dwarf unwinder only tested so far on i386 and x86_64,
- but globally disabled for now */
-#if 0
-// !defined(STP_USE_FRAME_BUFFER) && (defined(__i386__) || defined(__x86_64__))
-#define STP_USE_DWARF_UNWINDER
-#endif
-
#include "alloc.c"
#include "print.c"
#include "string.c"
diff --git a/runtime/unwind.c b/runtime/unwind.c
index 9c704e28..f7b19def 100644
--- a/runtime/unwind.c
+++ b/runtime/unwind.c
@@ -581,7 +581,7 @@ static int unwind(struct unwind_frame_info *frame)
if (UNW_PC(frame) == 0)
return -EINVAL;
- m = _stp_mod_sec_lookup (pc, &s);
+ m = _stp_mod_sec_lookup (pc, current, &s);
if (unlikely(m == NULL)) {
dbug_unwind(1, "No module found for pc=%lx", pc);
return -EINVAL;