summaryrefslogtreecommitdiffstats
path: root/tapsets.cxx
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2008-09-02 10:30:27 -0400
committerFrank Ch. Eigler <fche@elastic.org>2008-09-02 10:30:27 -0400
commitcd79792f037f23d9636ab9b4097af11d0aa26aea (patch)
tree38da0ddeab7cc0b0d332894b0a634338f2cd3ca9 /tapsets.cxx
parente070cc9c2f207bdaac1f3ca2c0ac4e291185bff1 (diff)
parenteebd7e0f235484ae0a6857fa41bda5dd61a2de68 (diff)
downloadsystemtap-steved-cd79792f037f23d9636ab9b4097af11d0aa26aea.tar.gz
systemtap-steved-cd79792f037f23d9636ab9b4097af11d0aa26aea.tar.xz
systemtap-steved-cd79792f037f23d9636ab9b4097af11d0aa26aea.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
* 'master' of ssh://sources.redhat.com/git/systemtap: Fix semantic error caused by -P option in nodwarf testing. revised for new publican build update added all else Display written but unread global statistics.
Diffstat (limited to 'tapsets.cxx')
-rw-r--r--tapsets.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/tapsets.cxx b/tapsets.cxx
index 0a7ca902..f71b8186 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -3453,7 +3453,8 @@ query_func_info (Dwarf_Addr entrypc,
else
{
if (q->sess.prologue_searching
- && !q->has_statement_str && !q->has_statement_num) // PR 2608
+ && !q->has_statement_str && !q->has_statement_num
+ && !q->sess.ignore_vmlinux && !q->sess.ignore_dwarf) // PR 2608
{
if (fi.prologue_end == 0)
throw semantic_error("could not find prologue-end "