diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-03-16 12:15:24 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-03-16 12:15:24 -0400 |
| commit | 24068a1f2e17857f4ce096a17244d09575a199c1 (patch) | |
| tree | b00dd1b858b19cc21a440d734e44ebe14d080d5a /runtime/stack.c | |
| parent | 5bc7237f1c7bdb0eb850752c9611f94d009feff0 (diff) | |
| parent | 2497c78e8aa704366683dad56fc8d749a5e92f52 (diff) | |
| download | systemtap-steved-24068a1f2e17857f4ce096a17244d09575a199c1.tar.gz systemtap-steved-24068a1f2e17857f4ce096a17244d09575a199c1.tar.xz systemtap-steved-24068a1f2e17857f4ce096a17244d09575a199c1.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts:
Makefile.in
main.cxx
stap-find-servers
stap-start-server
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; |