Commit-ID: 1659d129ed014b715b0b2120e6fd929bdd33ed03 Gitweb: http://git.kernel.org/tip/1659d129ed014b715b0b2120e6fd929bdd33ed03 Author: Jiri Olsa <jo...@redhat.com> AuthorDate: Wed, 22 Aug 2012 10:35:40 +0200 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Wed, 22 Aug 2012 15:33:12 -0300
perf tools: Keep the perf_event_attr on version 3 Stashing version 4 under version 3 and removing version 4, because both version changes were within single patchset. Reported-by: Peter Zijlstra <a.p.zijls...@chello.nl> Signed-off-by: Jiri Olsa <jo...@redhat.com> Acked-by: Peter Zijlstra <a.p.zijls...@chello.nl> Cc: Arun Sharma <asha...@fb.com> Cc: Benjamin Redelings <benjamin.redeli...@nescent.org> Cc: Corey Ashford <cjash...@linux.vnet.ibm.com> Cc: Cyrill Gorcunov <gorcu...@openvz.org> Cc: Frank Ch. Eigler <f...@redhat.com> Cc: Frederic Weisbecker <fweis...@gmail.com> Cc: H. Peter Anvin <h...@zytor.com> Cc: Ingo Molnar <mi...@kernel.org> Cc: Masami Hiramatsu <masami.hiramatsu...@hitachi.com> Cc: Paul Mackerras <pau...@samba.org> Cc: Peter Zijlstra <a.p.zijls...@chello.nl> Cc: Robert Richter <robert.rich...@amd.com> Cc: Stephane Eranian <eran...@google.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Tom Zanussi <tzanu...@gmail.com> Cc: Ulrich Drepper <drep...@gmail.com> Link: http://lkml.kernel.org/r/20120822083540.gb1...@krava.brq.redhat.com Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- include/linux/perf_event.h | 4 ++-- tools/perf/util/header.c | 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: diff --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, }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
