diff options
| author | Stephane Eranian <eranian@google.com> | 2012-02-09 16:12:38 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-02-13 23:35:04 -0200 |
| commit | 7e1ccd3804281fc0755eb726b654469c40a96d89 (patch) | |
| tree | dd262703dfc95983c4a8308b5f40fb41b404a1a6 /tools | |
| parent | f1c67db7e351bf9fd328e368ba045cbeca11d513 (diff) | |
| download | linux-7e1ccd3804281fc0755eb726b654469c40a96d89.tar.gz linux-7e1ccd3804281fc0755eb726b654469c40a96d89.tar.bz2 linux-7e1ccd3804281fc0755eb726b654469c40a96d89.zip | |
perf tools: cleanup initialization of attr->size
The perf_event_attr size needs to be initialized in all cases because it
captures the ABI version.
This patch moves the initialization of the field from the
perf_event_open() syscall stub to its proper location in the
event_attr_init().
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20120209151238.GA10272@quad
Signed-off-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/perf.h | 1 | ||||
| -rw-r--r-- | tools/perf/util/util.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h index deb17dba4a5b..03a045618148 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -167,7 +167,6 @@ sys_perf_event_open(struct perf_event_attr *attr, pid_t pid, int cpu, int group_fd, unsigned long flags) { - attr->size = sizeof(*attr); return syscall(__NR_perf_event_open, attr, pid, cpu, group_fd, flags); } diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index fb25d1329218..8109a907841e 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -14,6 +14,8 @@ void event_attr_init(struct perf_event_attr *attr) attr->exclude_host = 1; if (!perf_guest) attr->exclude_guest = 1; + /* to capture ABI version */ + attr->size = sizeof(*attr); } int mkdir_p(char *path, mode_t mode) |