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-x86_64.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-x86_64.c')
-rw-r--r-- | runtime/stack-x86_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/stack-x86_64.c b/runtime/stack-x86_64.c index 183de0a0..03d88ef0 100644 --- a/runtime/stack-x86_64.c +++ b/runtime/stack-x86_64.c @@ -10,7 +10,7 @@ /* 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; |