Home » Mailing list archives » linux-kernel » 2011 » January » 4

[PATCH 3/3] perf tools: Fix perf_event.h header usage

Previous thread: [PATCH 0/2] Annotate gpio-configuration with __must_check by Wolfram Sang on Tuesday, January 4, 2011 - 9:51 am. (7 messages)

Next thread: [PATCH 1/3] perf test: Clarify some error reports in the open syscall test by Arnaldo Carvalho de Melo on Tuesday, January 4, 2011 - 10:18 am. (1 message)
[view original message]
From: Arnaldo Carvalho de Melo
Subject: [PATCH 3/3] perf tools: Fix perf_event.h header usage
Date: Tuesday, January 4, 2011 - 10:18 am

From: Stephane Eranian <eranian@google.com>

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>
---
 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;
-- 
1.6.2.5

--


[ message continues ]
Previous thread: [PATCH 0/2] Annotate gpio-configuration with __must_check by Wolfram Sang on Tuesday, January 4, 2011 - 9:51 am. (7 messages)

Next thread: [PATCH 1/3] perf test: Clarify some error reports in the open syscall test by Arnaldo Carvalho de Melo on Tuesday, January 4, 2011 - 10:18 am. (1 message)