diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-04-06 11:40:01 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-04-06 11:40:01 -0400 |
| commit | 25ca9e9568b33bb244cfb77d924bd0b0ccbab6a0 (patch) | |
| tree | 6b6fbc681a5438788e19ed8879e150a72affbfc9 /tapsets.cxx | |
| parent | faf38cd9bd782cf460b2b46f29a6922205b0eab1 (diff) | |
| parent | a03c97419b5192fd594afb1f84e9ae4d0801e3a9 (diff) | |
| download | systemtap-steved-25ca9e9568b33bb244cfb77d924bd0b0ccbab6a0.tar.gz systemtap-steved-25ca9e9568b33bb244cfb77d924bd0b0ccbab6a0.tar.xz systemtap-steved-25ca9e9568b33bb244cfb77d924bd0b0ccbab6a0.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index 1b55684b..f6d73714 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -4906,8 +4906,9 @@ dwarf_var_expanding_visitor::visit_target_symbol (target_symbol *e) literal_number* ln_zero = new literal_number (0); ln_zero->tok = e->tok; provide (ln_zero); - q.sess.print_warning ("Bad variable being substituted with literal 0", - e->tok); + if (!q.sess.suppress_warnings) + q.sess.print_warning ("Bad $context variable being substituted with literal 0", + e->tok); } delete fdecl; delete ec; @@ -7499,6 +7500,10 @@ uprobe_derived_probe::join_group (systemtap_session& s) s.uprobe_derived_probes = new uprobe_derived_probe_group (); s.uprobe_derived_probes->enroll (this); task_finder_derived_probe_group::create_session_group (s); + + // Ask buildrun.cxx to build extra module if needed, and + // signal staprun to load that module + s.need_uprobes = true; } @@ -7531,8 +7536,6 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s) if (probes.empty()) return; s.op->newline() << "/* ---- user probes ---- */"; - s.need_uprobes = true; // Ask buildrun.cxx to build extra module if needed - // If uprobes isn't in the kernel, pull it in from the runtime. s.op->newline() << "#if defined(CONFIG_UPROBES) || defined(CONFIG_UPROBES_MODULE)"; s.op->newline() << "#include <linux/uprobes.h>"; |