From: Mark Wielaard <mjw@redhat.com>
Date: Mon, 5 Sep 2011 21:57:44 +0000 (+0200)
Subject: PR13112 Add include/asm/io_64.h blacklist.
X-Git-Tag: release-1.7~153^2~61
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=4a507da270189d642d20b8f621fa512a09d06bfe;p=systemtap.git

PR13112 Add include/asm/io_64.h blacklist.

Also simplify blfile include list (starting .* pattern needed for all
asm/include files means we can collapse some).
---

diff --git a/dwflpp.cxx b/dwflpp.cxx
index 23f5713c1..a05f53006 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -2958,16 +2958,13 @@ dwflpp::build_blacklist()
      so prefix those with '.*' - see PR13108 and PR13112. */
   blfile += "kernel/kprobes\\.c"; // first alternative, no "|"
   blfile += "|arch/.*/kernel/kprobes\\.c";
-  // Older kernels need ...
   blfile += "|.*/include/asm/io\\.h";
+  blfile += "|.*/include/asm/io_64\\.h";
   blfile += "|.*/include/asm/bitops\\.h";
-  // While newer ones need ...
-  blfile += "|.*/arch/.*/include/asm/io\\.h";
-  blfile += "|.*/arch/.*/include/asm/bitops\\.h";
   blfile += "|drivers/ide/ide-iops\\.c";
   // paravirt ops
   blfile += "|arch/.*/kernel/paravirt\\.c";
-  blfile += "|.*/arch/.*/include/asm/paravirt\\.h";
+  blfile += "|.*/include/asm/paravirt\\.h";
 
   // XXX: it would be nice if these blacklisted functions were pulled
   // in dynamically, instead of being statically defined here.