summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2009-12-20 15:43:53 -0500
committerFrank Ch. Eigler <fche@elastic.org>2009-12-20 15:43:53 -0500
commitd38b64a1e5b10514b9360b4a59545ad6033ac100 (patch)
tree35857ca99ed2d9b6c0df0e24e8b201a5eef4895b
parent182221914a187147ae7057d60c74e626224f99e0 (diff)
downloadsystemtap-steved-d38b64a1e5b10514b9360b4a59545ad6033ac100.tar.gz
systemtap-steved-d38b64a1e5b10514b9360b4a59545ad6033ac100.tar.xz
systemtap-steved-d38b64a1e5b10514b9360b4a59545ad6033ac100.zip
runtime: rhel4 build fix for uretprobe-wannabe stack tracebacks
* runtime/stack.c (_stp_stack_print): Comment out *retprobe logic if !CONFIG_UTRACE.
-rw-r--r--runtime/stack.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/stack.c b/runtime/stack.c
index 4dd1dca3..50dde6e1 100644
--- a/runtime/stack.c
+++ b/runtime/stack.c
@@ -133,13 +133,15 @@ static void _stp_stack_print(struct pt_regs *regs, int verbose, struct kretprobe
}
_stp_symbol_print((unsigned long)_stp_ret_addr_r(pi));
} else if (ri) {
+#ifdef CONFIG_UTRACE /* as a proxy for presence of uprobes */
if (verbose == SYM_VERBOSE_FULL) {
_stp_print("Returning from: ");
- _stp_usymbol_print(ri->rp->u.vaddr, tsk);
+ _stp_usymbol_print(ri->rp->u.vaddr, tsk); /* otherwise this dereference fails */
_stp_print("\nReturning to : ");
_stp_usymbol_print(ri->ret_addr, tsk);
} else
_stp_func_print(ri->ret_addr, verbose, 0, tsk);
+#endif
} else {
_stp_print_char(' ');
if (tsk)