Merge tag 'drm-misc-next-2021-07-22' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-microblaze.git] / tools / perf / util / cgroup.c

diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c
index e819a4f..e99b41f 100644 (file)
--- a/tools/perf/util/cgroup.c
+++ b/tools/perf/util/cgroup.c
@@ -18,6 +18,7 @@
 #include <regex.h>
 
 int nr_cgroups;
+bool cgrp_event_expanded;
 
 /* used to match cgroup name with patterns */
 struct cgroup_name {
@@ -458,7 +459,7 @@ int evlist__expand_cgroup(struct evlist *evlist, const char *str,
 
                        if (evsel__is_group_leader(pos))
                                leader = evsel;
-                       evsel->leader = leader;
+                       evsel__set_leader(evsel, leader);
 
                        evlist__add(tmp_list, evsel);
                }
@@ -484,6 +485,7 @@ int evlist__expand_cgroup(struct evlist *evlist, const char *str,
        }
 
        ret = 0;
+       cgrp_event_expanded = true;
 
 out_err:
        evlist__delete(orig_list);