These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / tools / perf / builtin-diff.c

diff --git a/kernel/tools/perf/builtin-diff.c b/kernel/tools/perf/builtin-diff.c
index df6307b..0b180a8 100644 (file)
--- a/kernel/tools/perf/builtin-diff.c
+++ b/kernel/tools/perf/builtin-diff.c
@@ -328,6 +328,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
 {
        struct addr_location al;
        struct hists *hists = evsel__hists(evsel);
+       int ret = -1;
 
        if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {
                pr_warning("problem processing %d event, skipping it.\n",
@@ -338,7 +339,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
        if (hists__add_entry(hists, &al, sample->period,
                             sample->weight, sample->transaction)) {
                pr_warning("problem incrementing symbol period, skipping event\n");
-               return -1;
+               goto out_put;
        }
 
        /*
@@ -350,8 +351,10 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
        hists->stats.total_period += sample->period;
        if (!al.filtered)
                hists->stats.total_non_filtered_period += sample->period;
-
-       return 0;
+       ret = 0;
+out_put:
+       addr_location__put(&al);
+       return ret;
 }
 
 static struct perf_tool tool = {
@@ -719,6 +722,9 @@ static void data_process(void)
                if (verbose || data__files_cnt > 2)
                        data__fprintf();
 
+               /* Don't sort callchain for perf diff */
+               perf_evsel__reset_sample_bit(evsel_base, CALLCHAIN);
+
                hists__process(hists_base);
        }
 }