diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-08-24 12:01:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-08-24 12:01:02 +0200 |
| commit | 734e9a26d612f64e1c9cfd92256969b773954ae2 (patch) | |
| tree | d6fd23e9cf7ea37d36060e877e856001d83e6c6c /include | |
| parent | d57c5d51a30152f3175d2344cb6395f08bf8ee0c (diff) | |
| parent | f63fe79fa0b1362e8ea1c1e4996cf70d14917b02 (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
* Improve warning message when libunwind devel packages not present, from Jiri Olsa
* Remove perf_event_attr needless version inflation, from Jiri Olsa
* Introduce libtraceevent strerror like error reporting facility, from Namhyung Kim
* Add pmu mappings to perf.data header and use event names from cmd line, from Robert Richter
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/perf_event.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 297ca3db6b4..28f9cee3fbc 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: |