Merge branch 'master' of git://sources.redhat.com/git/systemtap

1 files changed, 10 insertions, 2 deletions

diff --git a/tapsets.cxx b/tapsets.cxx
index 7cdf3c32..67412396 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -2425,8 +2425,11 @@ dwarf_query::build_blacklist()
 
   // XXX: it would be nice if these blacklisted functions were pulled
   // in dynamically, instead of being statically defined here.
-  // Perhaps it could be populated from script files.  A "noprobe
-  // kernel.function("...")"  construct might do the trick.
+  // Perhaps it could be populated from script files.  A 
+  //
+  //    noprobe kernel.function("...")" 
+  //
+  // construct might do the trick.
 
   // Most of these are marked __kprobes in newer kernels.  We list
   // them here (anyway) so the translator can block them on older
@@ -2497,6 +2500,11 @@ dwarf_query::build_blacklist()
   blfn += "|.*preempt_count.*";
   blfn += "|preempt_schedule";
 
+  // PR 6487, relay/timer interactions
+  blfile += "|kernel/relay.c";
+  blfile += "|kernel/timer.c";
+  //  blfile += "|kernel/workqueue.c";
+
   // These functions don't return, so return probes would never be recovered
   blfn_ret += "do_exit"; // no "|"
   blfn_ret += "|sys_exit";