diff options
| author | Stephane Eranian <eranian@google.com> | 2011-01-04 16:30:01 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-01-05 14:52:54 -0200 |
| commit | d030260ad33b482a371f999c7e9db79ef7a2111f (patch) | |
| tree | 1c811786ddde2d9f21a231a20b2e83aa2df3af3c /tools/perf | |
| parent | 454a3bbe9b75eb8cbddffcf383fbb8e97ea78f52 (diff) | |
| download | linux-d030260ad33b482a371f999c7e9db79ef7a2111f.tar.gz | |
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@davemloft.net> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Robert Richter <robert.richter@amd.com> Cc: Stephane Eranian <eranian@gmail.com> LKML-Reference: <4d233cf0.2308e30a.7b00.ffffc187@mx.google.com> Signed-off-by: Stephane Eranian <eranian@google.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/evsel.h | 2 | ||||
| -rw-r--r-- | 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 863d78d5ef1a..a0ccd69c3fc2 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 1c9043ccd173..b82cafb83772 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; |