Commit-ID: d030260ad33b482a371f999c7e9db79ef7a2111f Gitweb: http://git.kernel.org/tip/d030260ad33b482a371f999c7e9db79ef7a2111f Author: Stephane Eranian <eranian@xxxxxxxxxx> AuthorDate: Tue, 4 Jan 2011 16:30:01 +0200 Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> CommitDate: Wed, 5 Jan 2011 14:52:54 -0200 perf tools: Fix perf_event.h header usage This patch fixes the usage of the perf_event.h header file between command modules and the supporting code in util. It is necessary to ensure that ALL files use the SAME perf_event.h header from the kernel source tree. There were a couple of #include <linux/perf_event.h> mixed with #include "../../perf_event.h". This caused issues on some distros because of mismatch in the layout of struct perf_event_attr. That eventually led perf stat to segfault. Cc: David S. Miller <davem@xxxxxxxxxxxxx> Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Robert Richter <robert.richter@xxxxxxx> Cc: Stephane Eranian <eranian@xxxxxxxxx> LKML-Reference: <4d233cf0.2308e30a.7b00.ffffc187@xxxxxxxxxxxxx> Signed-off-by: Stephane Eranian <eranian@xxxxxxxxxx> Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> --- tools/perf/util/evsel.h | 2 +- tools/perf/util/parse-events.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 863d78d..a0ccd69 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -3,7 +3,7 @@ #include <linux/list.h> #include <stdbool.h> -#include <linux/perf_event.h> +#include "../../../include/linux/perf_event.h" #include "types.h" #include "xyarray.h" diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 1c9043c..b82cafb 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -4,7 +4,7 @@ * Parse symbolic events/counts passed in as options: */ -#include <linux/perf_event.h> +#include "../../../include/linux/perf_event.h" struct list_head; struct perf_evsel; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|