diff options
| author | Mark Wielaard <mjw@redhat.com> | 2009-03-17 16:58:35 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2009-03-17 16:58:35 +0100 |
| commit | bf33ee46c8fff4d181b7f28521f12175bd32ec77 (patch) | |
| tree | 5e0a9e1047af60389eee36da54182b52d3d53ee7 /runtime/stack-i386.c | |
| parent | 524c6f82b0a3c010d0fd6a67b1afcfbf55b789a6 (diff) | |
| parent | 30cb532a560ed152b86506b80490e99195970271 (diff) | |
| download | systemtap-steved-bf33ee46c8fff4d181b7f28521f12175bd32ec77.tar.gz systemtap-steved-bf33ee46c8fff4d181b7f28521f12175bd32ec77.tar.xz systemtap-steved-bf33ee46c8fff4d181b7f28521f12175bd32ec77.zip | |
Merge branch 'master' into pr6866
Resolved conflicts:
runtime/task_finder.c: name vs path.
Diffstat (limited to 'runtime/stack-i386.c')
| -rw-r--r-- | runtime/stack-i386.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/stack-i386.c b/runtime/stack-i386.c index 206801d8..5a18c9d8 100644 --- a/runtime/stack-i386.c +++ b/runtime/stack-i386.c @@ -14,7 +14,7 @@ static int _stp_valid_stack_ptr(unsigned long context, unsigned long p) } /* DWARF unwinder failed. Just dump intereting addresses on kernel stack. */ -#if ! (defined(CONFIG_STACKTRACE) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)) +#if !defined(STAPCONF_KERNEL_STACKTRACE) static void _stp_stack_print_fallback(unsigned long stack, int verbose, int levels) { unsigned long addr; |