Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / tools / perf / builtin-diff.c

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 4d72359..9ce354f 100644 (file)
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -330,7 +330,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
        struct hists *hists = evsel__hists(evsel);
        int ret = -1;
 
-       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;
@@ -428,7 +428,7 @@ static void hists__baseline_only(struct hists *hists)
        struct rb_root *root;
        struct rb_node *next;
 
-       if (sort__need_collapse)
+       if (hists__has(hists, need_collapse))
                root = &hists->entries_collapsed;
        else
                root = hists->entries_in;
@@ -450,7 +450,7 @@ static void hists__precompute(struct hists *hists)
        struct rb_root *root;
        struct rb_node *next;
 
-       if (sort__need_collapse)
+       if (hists__has(hists, need_collapse))
                root = &hists->entries_collapsed;
        else
                root = hists->entries_in;