diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-07-13 11:23:32 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-07-13 11:23:32 -0400 |
| commit | ee03b2aaf05b2ffed68f2023c8ea61a6ebb5d0ee (patch) | |
| tree | 2654459de4f19ade39c40f59d2bc4f368c24764f /tapsets.cxx | |
| parent | 5739030625d3f1697c264e3d8f04e932d1e0773d (diff) | |
| parent | 4a4edc21a14792a4cc240b601912734027945ae8 (diff) | |
| download | systemtap-steved-ee03b2aaf05b2ffed68f2023c8ea61a6ebb5d0ee.tar.gz systemtap-steved-ee03b2aaf05b2ffed68f2023c8ea61a6ebb5d0ee.tar.xz systemtap-steved-ee03b2aaf05b2ffed68f2023c8ea61a6ebb5d0ee.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts:
main.cxx
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index d7fc79ac..51e2917f 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -3245,7 +3245,7 @@ dwarf_derived_probe_group::emit_module_init (systemtap_session& s) s.op->newline() << "if (rc) {"; // PR6749: tolerate a failed register_*probe. s.op->newline(1) << "sdp->registered_p = 0;"; s.op->newline() << "if (!sdp->optional_p)"; - s.op->newline(1) << "_stp_warn (\"probe %s registration error (rc %d)\", probe_point, rc);"; + s.op->newline(1) << "_stp_warn (\"probe %s (address 0x%lx) registration error (rc %d)\", probe_point, relocated_addr, rc);"; s.op->newline(-1) << "rc = 0;"; // continue with other probes // XXX: shall we increment numskipped? s.op->newline(-1) << "}"; @@ -4795,7 +4795,7 @@ kprobe_derived_probe_group::emit_module_init (systemtap_session& s) s.op->newline() << "if (rc) {"; // PR6749: tolerate a failed register_*probe. s.op->newline(1) << "sdp->registered_p = 0;"; s.op->newline() << "if (!sdp->optional_p)"; - s.op->newline(1) << "_stp_warn (\"probe %s registration error (rc %d)\", probe_point, rc);"; + s.op->newline(1) << "_stp_warn (\"probe %s (address 0x%lx) registration error (rc %d)\", probe_point, addr, rc);"; s.op->newline(-1) << "rc = 0;"; // continue with other probes // XXX: shall we increment numskipped? s.op->newline(-1) << "}"; |