From 508968a7d10bbae3b9fbc33bf3d3b1e62a8a018a Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Wed, 18 Nov 2009 13:32:22 -0800 Subject: 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. --- tapsets.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tapsets.cxx') 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++) { -- cgit