projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge v5.14-rc3 into usb-next
[linux-2.6-microblaze.git]
/
tools
/
perf
/
util
/
pfm.c
diff --git
a/tools/perf/util/pfm.c
b/tools/perf/util/pfm.c
index
6eef6df
..
756295d
100644
(file)
--- a/
tools/perf/util/pfm.c
+++ b/
tools/perf/util/pfm.c
@@
-99,7
+99,7
@@
int parse_libpfm_events_option(const struct option *opt, const char *str,
grp_leader = evsel;
if (grp_evt > -1) {
grp_leader = evsel;
if (grp_evt > -1) {
- evsel
->leader = grp_leader
;
+ evsel
__set_leader(evsel, grp_leader)
;
grp_leader->core.nr_members++;
grp_evt++;
}
grp_leader->core.nr_members++;
grp_evt++;
}
@@
-110,7
+110,7
@@
int parse_libpfm_events_option(const struct option *opt, const char *str,
"cannot close a non-existing event group\n");
goto error;
}
"cannot close a non-existing event group\n");
goto error;
}
- evlist->nr_groups++;
+ evlist->
core.
nr_groups++;
grp_leader = NULL;
grp_evt = -1;
}
grp_leader = NULL;
grp_evt = -1;
}