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 /elaborate.cxx | |
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 'elaborate.cxx')
-rw-r--r-- | elaborate.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/elaborate.cxx b/elaborate.cxx index 0a00ebf2..34e6ab16 100644 --- a/elaborate.cxx +++ b/elaborate.cxx @@ -1448,6 +1448,7 @@ systemtap_session::systemtap_session (): timer_derived_probes(0), profile_derived_probes(0), mark_derived_probes(0), + tracepoint_derived_probes(0), hrtimer_derived_probes(0), perfmon_derived_probes(0), procfs_derived_probes(0), |