From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@redhat.com>,
Arun Sharma <asharma@fb.com>,
Benjamin Redelings <benjamin.redelings@nescent.org>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
Cyrill Gorcunov <gorcunov@openvz.org>,
"Frank Ch. Eigler" <fche@redhat.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Robert Richter <robert.richter@amd.com>,
Stephane Eranian <eranian@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
Tom Zanussi <tzanussi@gmail.com>,
Ulrich Drepper <drepper@gmail.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 07/12] perf tools: Keep the perf_event_attr on version 3
Date: Thu, 23 Aug 2012 12:09:51 -0300 [thread overview]
Message-ID: <1345734596-7601-8-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1345734596-7601-1-git-send-email-acme@infradead.org>
From: Jiri Olsa <jolsa@redhat.com>
Stashing version 4 under version 3 and removing version 4, because both
version changes were within single patchset.
Reported-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arun Sharma <asharma@fb.com>
Cc: Benjamin Redelings <benjamin.redelings@nescent.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Frank Ch. Eigler <fche@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Ulrich Drepper <drepper@gmail.com>
Link: http://lkml.kernel.org/r/20120822083540.GB1003@krava.brq.redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
include/linux/perf_event.h | 4 ++--
| 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 297ca3d..28f9cee 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -205,8 +205,8 @@ enum perf_event_read_format {
#define PERF_ATTR_SIZE_VER0 64 /* sizeof first published struct */
#define PERF_ATTR_SIZE_VER1 72 /* add: config2 */
#define PERF_ATTR_SIZE_VER2 80 /* add: branch_sample_type */
-#define PERF_ATTR_SIZE_VER3 88 /* add: sample_regs_user */
-#define PERF_ATTR_SIZE_VER4 96 /* add: sample_stack_user */
+#define PERF_ATTR_SIZE_VER3 96 /* add: sample_regs_user */
+ /* add: sample_stack_user */
/*
* Hardware event_id to monitor via a performance monitoring event:
--git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 63aad31..9696e64 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2011,7 +2011,6 @@ static const int attr_file_abi_sizes[] = {
[1] = PERF_ATTR_SIZE_VER1,
[2] = PERF_ATTR_SIZE_VER2,
[3] = PERF_ATTR_SIZE_VER3,
- [4] = PERF_ATTR_SIZE_VER4,
0,
};
--
1.7.1
next prev parent reply other threads:[~2012-08-23 15:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1345734596-7601-1-git-send-email-acme@infradead.org>
2012-08-23 15:09 ` [PATCH 01/12] perf tools: Fix 'No libunwind found' make warning message Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 02/12] perf test: Do not abort tests on error Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 03/12] perf tools: Catch event names from command line Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 04/12] perf tools: Refactor print_event_desc() Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 05/12] perf report: Update event names from header description Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 06/12] perf tools: Add pmu mappings to header information Arnaldo Carvalho de Melo
2012-08-23 15:09 ` Arnaldo Carvalho de Melo [this message]
2012-08-23 15:09 ` [PATCH 08/12] tools lib traceevent: Do not link broken field arg for an old ftrace event Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 09/12] tools lib traceevent: Introduce pevent_errno Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 10/12] tools lib traceevent: Introduce pevent_strerror Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 11/12] tools lib traceevent: Fix strerror_r() use in pevent_strerror Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 12/12] tools lib traceevent: Fix off-by-one bug in pevent_strerror() Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345734596-7601-8-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=asharma@fb.com \
--cc=benjamin.redelings@nescent.org \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=drepper@gmail.com \
--cc=eranian@google.com \
--cc=fche@redhat.com \
--cc=fweisbec@gmail.com \
--cc=gorcunov@openvz.org \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=paulus@samba.org \
--cc=robert.richter@amd.com \
--cc=tglx@linutronix.de \
--cc=tzanussi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).