Merge remote-tracking branches 'regulator/fix/anatop', 'regulator/fix/gpio', 'regulat...

[firefly-linux-kernel-4.4.55.git] / tools / perf / util / evsel.c

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index bac25f41a7518d48fb35fe5b93948937b9ec5341..5410483d52198c5909ec5a502c61567c5119c8ef 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -787,7 +787,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts)
                perf_evsel__config_callgraph(evsel, opts, &callchain_param);
 
        if (opts->sample_intr_regs) {
-               attr->sample_regs_intr = PERF_REGS_MASK;
+               attr->sample_regs_intr = opts->sample_intr_regs;
                perf_evsel__set_sample_bit(evsel, REGS_INTR);
        }
 
@@ -1033,6 +1033,7 @@ void perf_evsel__exit(struct perf_evsel *evsel)
        perf_evsel__free_config_terms(evsel);
        close_cgroup(evsel->cgrp);
        cpu_map__put(evsel->cpus);
+       cpu_map__put(evsel->own_cpus);
        thread_map__put(evsel->threads);
        zfree(&evsel->group_name);
        zfree(&evsel->name);