1 files changed, 27 insertions, 22 deletions

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index c17f3558a37a..4e840bfc19ef 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -124,6 +124,33 @@ void perf_evlist__delete(struct perf_evlist *evlist)
         free(evlist);
 }
 
+static void __perf_evlist__propagate_maps(struct perf_evlist *evlist,
+                                          struct perf_evsel *evsel)
+{
+        /*
+         * We already have cpus for evsel (via PMU sysfs) so
+         * keep it, if there's no target cpu list defined.
+         */
+        if (!evsel->own_cpus || evlist->has_user_cpus) {
+                cpu_map__put(evsel->cpus);
+                evsel->cpus = cpu_map__get(evlist->cpus);
+        } else if (evsel->cpus != evsel->own_cpus) {
+                cpu_map__put(evsel->cpus);
+                evsel->cpus = cpu_map__get(evsel->own_cpus);
+        }
+
+        thread_map__put(evsel->threads);
+        evsel->threads = thread_map__get(evlist->threads);
+}
+
+static void perf_evlist__propagate_maps(struct perf_evlist *evlist)
+{
+        struct perf_evsel *evsel;
+
+        evlist__for_each(evlist, evsel)
+                __perf_evlist__propagate_maps(evlist, evsel);
+}
+
 void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry)
 {
         entry->evlist = evlist;
@@ -1102,28 +1129,6 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,
         return perf_evlist__mmap_ex(evlist, pages, overwrite, 0, false);
 }
 
-static void perf_evlist__propagate_maps(struct perf_evlist *evlist)
-{
-        struct perf_evsel *evsel;
-
-        evlist__for_each(evlist, evsel) {
-                /*
-                 * We already have cpus for evsel (via PMU sysfs) so
-                 * keep it, if there's no target cpu list defined.
-                 */
-                if (!evsel->own_cpus || evlist->has_user_cpus) {
-                        cpu_map__put(evsel->cpus);
-                        evsel->cpus = cpu_map__get(evlist->cpus);
-                } else if (evsel->cpus != evsel->own_cpus) {
-                        cpu_map__put(evsel->cpus);
-                        evsel->cpus = cpu_map__get(evsel->own_cpus);
-                }
-
-                thread_map__put(evsel->threads);
-                evsel->threads = thread_map__get(evlist->threads);
-        }
-}
-
 int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)
 {
         struct cpu_map *cpus;