summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Cohen <wcohen@redhat.com>2008-11-06 23:45:46 -0500
committerWilliam Cohen <wcohen@redhat.com>2008-11-06 23:45:46 -0500
commit6289cc1a47af070486da1595609b6e2aa79514a3 (patch)
tree0bd93ccc583ac1b441afe94c80c272eb1d9a8ef9
parent94906938d7d94e1b91b1d205ae8b12b530795baf (diff)
parent76e954ca894160d4f4d3319b98c9cb6f94b42476 (diff)
downloadsystemtap-steved-6289cc1a47af070486da1595609b6e2aa79514a3.tar.gz
systemtap-steved-6289cc1a47af070486da1595609b6e2aa79514a3.tar.xz
systemtap-steved-6289cc1a47af070486da1595609b6e2aa79514a3.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
-rw-r--r--ChangeLog5
-rw-r--r--tapsets.cxx2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f7ecbb90..c9e1c903 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-06 Stan Cox <scox@redhat.com>
+
+ * tapsets.cxx (dwflpp::module_address_to_global):
+ ET_EXEC needs no further relocation.
+
2008-11-04 Frank Ch. Eigler <fche@elastic.org>
From Masami Hiramatsu <mhiramat@redhat.com>, PR 6028.
diff --git a/tapsets.cxx b/tapsets.cxx
index 5acf50cb..25d88a9c 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -791,7 +791,7 @@ struct dwflpp
assert(dwfl);
assert(module);
get_module_dwarf();
- if (module_name == TOK_KERNEL)
+ if (module_name == TOK_KERNEL || dwfl_module_relocations (module) <= 0)
return a;
return a + module_start;
}