summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2009-11-18 13:32:22 -0800
committerJosh Stone <jistone@redhat.com>2009-11-18 13:32:22 -0800
commit508968a7d10bbae3b9fbc33bf3d3b1e62a8a018a (patch)
treea76644feb566a3d1b98fdd2d3d6b93fe37ebbb83
parent02a2d6ca6f9120cc39cc1eb5ffe089b88dd4d818 (diff)
downloadsystemtap-steved-508968a7d10bbae3b9fbc33bf3d3b1e62a8a018a.tar.gz
systemtap-steved-508968a7d10bbae3b9fbc33bf3d3b1e62a8a018a.tar.xz
systemtap-steved-508968a7d10bbae3b9fbc33bf3d3b1e62a8a018a.zip
PR10983: Give preference to tracepoints in trace/events/
In 2.6.32-rc7, there are two power.h tracepoints headers, and only the one in trace/events/ is valid. In general, we can expect that trace/events/ has newer headers, so we should search those first. * tapsets.cxx (tracepoint_builder::init_dw): Search /events/ first.
-rw-r--r--tapsets.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/tapsets.cxx b/tapsets.cxx
index c972de5f..7bae4615 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -6313,10 +6313,10 @@ tracepoint_builder::init_dw(systemtap_session& s)
glob_t trace_glob;
string globs[] = {
- "/include/trace/*.h",
"/include/trace/events/*.h",
- "/source/include/trace/*.h",
"/source/include/trace/events/*.h",
+ "/include/trace/*.h",
+ "/source/include/trace/*.h",
};
for (unsigned z = 0; z < sizeof(globs) / sizeof(globs[0]); z++)
{