diff options
| author | Dave Brolley <brolley@redhat.com> | 2008-08-08 15:15:19 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2008-08-08 15:15:19 -0400 |
| commit | 71906647386a9684086b0542318b536d95ae089c (patch) | |
| tree | fb0348d7bb34095e95ad830da8e832bad9187a55 /tapsets.cxx | |
| parent | d5658775da9fa0ac792eb3f874df9f7c4d60de7e (diff) | |
| parent | f1118e1032612170cae8cd979cd529722ad95fdb (diff) | |
| download | systemtap-steved-71906647386a9684086b0542318b536d95ae089c.tar.gz systemtap-steved-71906647386a9684086b0542318b536d95ae089c.tar.xz systemtap-steved-71906647386a9684086b0542318b536d95ae089c.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts:
ChangeLog
testsuite/ChangeLog
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index ca91659b..c5679043 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -4280,6 +4280,7 @@ dwarf_var_expanding_copy_visitor::visit_target_symbol (target_symbol *e) case DW_TAG_variable: if (e->base_name == "$$parms") continue; + break; case DW_TAG_formal_parameter: if (e->base_name == "$$locals") continue; @@ -6289,13 +6290,7 @@ utrace_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->newline() << "case UDPF_SYSCALL:"; s.op->newline() << "case UDPF_SYSCALL_RETURN:"; s.op->indent(1); - s.op->newline() << "engine = utrace_attach(tsk, UTRACE_ATTACH_MATCH_OPS, &p->ops, 0);"; - s.op->newline() << "if (! IS_ERR(engine) && engine != NULL) {"; - s.op->indent(1); - s.op->newline() << "utrace_detach(tsk, engine);"; - s.op->newline() << "debug_task_finder_detach();"; - - s.op->newline(-1) << "}"; + s.op->newline() << "stap_utrace_detach(tsk, &p->ops);"; s.op->newline() << "break;"; s.op->indent(-1); } |