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.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.c')
| -rw-r--r-- | runtime/stack.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/runtime/stack.c b/runtime/stack.c index aa0e6d65..f6b1cd08 100644 --- a/runtime/stack.c +++ b/runtime/stack.c @@ -27,8 +27,7 @@ #define MAXBACKTRACE 20 -#if defined(CONFIG_STACKTRACE) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26) -// XXX: PR9866: hacky temporarily restriction to recent kernels +#if defined(STAPCONF_KERNEL_STACKTRACE) #include <linux/stacktrace.h> #include <asm/stacktrace.h> #endif @@ -51,7 +50,7 @@ static void _stp_stack_print_fallback(unsigned long, int, int); #error "Unsupported architecture" #endif -#if defined(CONFIG_STACKTRACE) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26) +#if defined(STAPCONF_KERNEL_STACKTRACE) struct print_stack_data { @@ -161,7 +160,7 @@ static void _stp_ustack_print(char *str) void _stp_stack_print_tsk(struct task_struct *tsk, int verbose, int levels) { -#if defined(CONFIG_STACKTRACE) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26) +#if defined(STAPCONF_KERNEL_STACKTRACE) int i; unsigned long backtrace[MAXBACKTRACE]; struct stack_trace trace; |