diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-20 09:31:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-20 09:31:22 +0200 |
| commit | 40d4f23f42b0e6997db5bbfba9dc6bf349e8ad81 (patch) | |
| tree | 38daabe92501b668a1fe4bab9c2b1e310a39a3b2 /tools/perf/builtin-script.c | |
| parent | e9363deeb286e916353f11b11d1f351c6ff54082 (diff) | |
| parent | a4c6a3e8bbb675a601f529881c51ff226f83c3f1 (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:
User visible changes:
- 'perf bench mem' now prefaults unconditionally, no sense in
providing modes where page faults are measured. (Ingo Molnar)
- Harmonize -l/--nr_loops accross 'perf bench'. (Ingo Molnar)
- Various 'perf bench' consistency improvements. (Ingo Molnar)
- Suppress libtraceevent warnings in non-verbose 'perf test' mode.
(Namhyung Kim)
- Move some tracepoint event test error messages to the verbose mode
of 'perf test'. (Namhyung Kim)
- Make 'perf help' usage message consistent with other tools. (Yunlong Song)
Build fixes:
- Fix 'perf bench' build with gcc 4.4.7. (Arnaldo Carvalho de Melo)
Infrastructure changes:
- 'perf stat' prep work for the 'perf stat scripting' patchkit. (Jiri Olsa)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-script.c')
| -rw-r--r-- | tools/perf/builtin-script.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 8ce1c6bbfa45..2653c0273b89 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -686,7 +686,10 @@ static int process_attr(struct perf_tool *tool, union perf_event *event, set_print_ip_opts(&evsel->attr); - return perf_evsel__check_attr(evsel, scr->session); + if (evsel->attr.sample_type) + err = perf_evsel__check_attr(evsel, scr->session); + + return err; } static int process_comm_event(struct perf_tool *tool, |