Commit 1659d129 authored Aug 22, 2012 by Jiri Olsa Committed by Arnaldo Carvalho de Melo Aug 22, 2012

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.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>

parent 50a9667c

include/linux/perf_event.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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:

tools/perf/util/header.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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,
		};

Admin message