diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-06-18 17:25:08 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-06-18 17:25:08 -0700 |
| commit | 6ea24cf79e055f0a62a64baa8587e2254a493c7b (patch) | |
| tree | c5cd6113ed93854b1bc30cd471c366f080c4be2f /tools/perf/builtin-annotate.c | |
| parent | 540c26087bfbad6ea72758b76b16ae6282a73fea (diff) | |
| parent | 488326947cd1f038da8d2c9068a0d07b913b7983 (diff) | |
| download | talos-op-linux-6ea24cf79e055f0a62a64baa8587e2254a493c7b.tar.gz talos-op-linux-6ea24cf79e055f0a62a64baa8587e2254a493c7b.zip | |
Merge branch 'cec-defines' into for-linus
Let's bring in HDMI CEC defines to ease merging CEC support in the next
merge window.
Diffstat (limited to 'tools/perf/builtin-annotate.c')
| -rw-r--r-- | tools/perf/builtin-annotate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index cc5c1267c738..814158393656 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -94,7 +94,7 @@ static int process_sample_event(struct perf_tool *tool, struct addr_location al; int ret = 0; - if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) { + if (machine__resolve(machine, &al, sample) < 0) { pr_warning("problem processing %d event, skipping it.\n", event->header.type); return -1; @@ -245,7 +245,7 @@ static int __cmd_annotate(struct perf_annotate *ann) hists__collapse_resort(hists, NULL); /* Don't sort callchain */ perf_evsel__reset_sample_bit(pos, CALLCHAIN); - hists__output_resort(hists, NULL); + perf_evsel__output_resort(pos, NULL); if (symbol_conf.event_group && !perf_evsel__is_group_leader(pos)) |
