diff options
author | Dave Brolley <brolley@redhat.com> | 2009-12-21 12:42:11 -0500 |
---|---|---|
committer | Dave Brolley <brolley@redhat.com> | 2009-12-21 12:42:11 -0500 |
commit | 25a0404570724499bcdf1ebfd9f03084c2e00137 (patch) | |
tree | f9824f847b407790ab10116c2ebcc7e664d53253 /runtime/stack.c | |
parent | 08098abb6b206dc3aea984f18b5054d34e015185 (diff) | |
parent | c6fcc4c1ca5f222cf90bf3968e34a10f09b30be4 (diff) | |
download | systemtap-steved-25a0404570724499bcdf1ebfd9f03084c2e00137.tar.gz systemtap-steved-25a0404570724499bcdf1ebfd9f03084c2e00137.tar.xz systemtap-steved-25a0404570724499bcdf1ebfd9f03084c2e00137.zip |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'runtime/stack.c')
-rw-r--r-- | runtime/stack.c | 4 |
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) |