diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-02 10:48:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-02 10:48:16 +0200 |
| commit | b9df84fd7c05cc300d6d14f022b8a00773ebcf8c (patch) | |
| tree | b7a3346416c6d1229ff79ade4fe8646c95125dd8 /tools/perf/builtin-report.c | |
| parent | 93472aff802fd7b61f2209335207e9bd793012f7 (diff) | |
| parent | 5ef7bbb09f7b91ef06524c72e1ab1fc48e0d6682 (diff) | |
| download | linux-b9df84fd7c05cc300d6d14f022b8a00773ebcf8c.tar.gz linux-b9df84fd7c05cc300d6d14f022b8a00773ebcf8c.tar.bz2 linux-b9df84fd7c05cc300d6d14f022b8a00773ebcf8c.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core fixes from Arnaldo Carvalho de Melo:
Build fixes:
- Create config.detected into OUTPUT directory, fixing parallel
builds sharing the same source directory (Aaro Kiskinen)
- Allow to specify custom linker command, fixing some MIPS64
builds. (Aaro Kiskinen)
Infrastructure fixes:
- Add missing break for PERF_RECORD_ITRACE_START, which caused those events
samples to be parsed as well as PERF_RECORD_LOST_SAMPLES. ITRACE_START only
appears when Intel PT or BTS are present, so (Jiri Olsa)
- Call the perf_session destructor when bailing out in the inject, kmem, report,
kvm and mem tools (Taeung Song)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-report.c')
| -rw-r--r-- | tools/perf/builtin-report.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 348bed4a2abf..95a47719aec3 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -839,8 +839,10 @@ repeat: if (report.header || report.header_only) { perf_session__fprintf_info(session, stdout, report.show_full_info); - if (report.header_only) - return 0; + if (report.header_only) { + ret = 0; + goto error; + } } else if (use_browser == 0) { fputs("# To display the perf.data header info, please use --header/--header-only options.\n#\n", stdout); |