diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-11 10:20:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-11 10:20:06 -0800 |
| commit | d5b76bef01047843cc65bd018046c76182b1fc81 (patch) | |
| tree | 13aa1b0019d2afeb53257edde54e36c3fa86ecdf /tools/perf/builtin-diff.c | |
| parent | 4e4f74a7eebbc52eaa1dc3c0be6b3c68c0875b09 (diff) | |
| parent | 451d24d1e5f40bad000fa9abe36ddb16fc9928cb (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"A kernel crash fix plus three tooling fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/core: Fix crash in perf_event_read()
perf callchain: Reference count maps
perf diff: Fix -o/--order option behavior (again)
perf diff: Fix segfault on 'perf diff -o N' option
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 9ff0db4e2d0c..933aeec46f4a 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; } |