diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-11 11:56:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-11 11:56:27 +0200 |
| commit | f7dc7fd1c08c6d8109688694fd93d80645df89ff (patch) | |
| tree | 255e1e24bcf089d584e45ea8a733883c1bb4d74c /tools/perf/builtin-report.c | |
| parent | 32b0ed3ae66cd6114f8510161f833f05518c0395 (diff) | |
| parent | 44b11fee51711ca85aa2b121a49bf029d18a3722 (diff) | |
| download | linux-0-day-f7dc7fd1c08c6d8109688694fd93d80645df89ff.tar.gz linux-0-day-f7dc7fd1c08c6d8109688694fd93d80645df89ff.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to resolve conflicts
Conflicts:
tools/perf/builtin-kmem.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-report.c')
| -rw-r--r-- | tools/perf/builtin-report.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 8d5118f5cedde..62b49ca0fc7b0 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -332,7 +332,7 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist, fprintf(stdout, "\n\n"); } - if (sort_order == default_sort_order && + if (sort_order == NULL && parent_pattern == default_parent_pattern) { fprintf(stdout, "#\n# (%s)\n#\n", help); |