diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-02-03 20:42:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-02-03 20:42:30 +0100 |
| commit | 53e74a112ce5c1c9b6a6923bdd6612133625d579 (patch) | |
| tree | c1da92403bc6fb54d199df4a06476ab103fe6e22 /tools/perf/builtin-diff.c | |
| parent | 34e00accf612bc5448ae709245c2b408edf39f46 (diff) | |
| parent | aa33b9b9a2ebb00d33c83a5312d4fbf2d5aeba36 (diff) | |
Merge tag 'perf-urgent-for-mingo-4.10-20170203' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
- Reference count maps in callchains, fixing a SEGFAULT when referencing a
map after it is freed (Krister Johansen)
- Fix segfault on 'perf diff -o N' option (Namhyung Kim)
- Fix 'perf diff -o/--order' option behavior (Namhyung Kim)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-diff.c')
| -rw-r--r-- | tools/perf/builtin-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index 9ff0db4e2d0cd..933aeec46f4a1 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -1199,7 +1199,7 @@ static int ui_init(void) BUG_ON(1); } - perf_hpp__register_sort_field(fmt); + perf_hpp__prepend_sort_field(fmt); return 0; } |