diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2007-10-08 21:15:01 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2007-10-08 21:15:01 -0400 |
| commit | 38d7fc30b108ec4a9e74ddb33d945cce1bd5c4c6 (patch) | |
| tree | 7a211e51e13e7e631306d90b17decda4497676b6 /tapsets.cxx | |
| parent | 9d33454315110680fda3a926465c3002a0521431 (diff) | |
| parent | 7574941533c7ca9a4b1715cbfd785f732be48266 (diff) | |
| download | systemtap-steved-38d7fc30b108ec4a9e74ddb33d945cce1bd5c4c6.tar.gz systemtap-steved-38d7fc30b108ec4a9e74ddb33d945cce1bd5c4c6.tar.xz systemtap-steved-38d7fc30b108ec4a9e74ddb33d945cce1bd5c4c6.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index c4d6962e..2af94890 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -4027,11 +4027,12 @@ public: }; -uprobe_derived_probe::uprobe_derived_probe (systemtap_session &, +uprobe_derived_probe::uprobe_derived_probe (systemtap_session &s, probe* p, probe_point* l, uint64_t pp, uint64_t aa, bool rr): derived_probe(p, l), process(pp), address(aa), return_p (rr) { + s.need_uprobes = true; } @@ -4073,11 +4074,10 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->newline() << "/* ---- user probes ---- */"; // If uprobes isn't in the kernel, pull it in from the runtime. - // TODO: Consider detecting uprobes installed as a module. - s.op->newline() << "#ifdef CONFIG_UPROBES"; + s.op->newline() << "#if defined(CONFIG_UPROBES) || defined(CONFIG_UPROBES_MODULE)"; s.op->newline() << "#include <linux/uprobes.h>"; s.op->newline() << "#else"; - s.op->newline() << "#include \"uprobes/uprobes.c\""; + s.op->newline() << "#include \"uprobes/uprobes.h\""; s.op->newline() << "#endif"; s.op->newline() << "struct stap_uprobe {"; |