diff options
| author | Linus Torvalds | 2023-10-21 11:09:29 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2023-10-21 11:09:29 -0700 |
| commit | 94be133fb2b8a36d79b362b3bafbdfd054a4da89 (patch) | |
| tree | 34764050153400d7d98e9426aaaef3d1a7f09836 /include | |
| parent | 023cc836053539148ffd015d3938887ef19af1cd (diff) | |
| parent | 32671e3799ca2e4590773fd0e63aaa4229e50c06 (diff) | |
Merge tag 'perf-urgent-2023-10-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf events fix from Ingo Molnar:
"Fix group event semantics"
* tag 'perf-urgent-2023-10-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Disallow mis-matched inherited group reads
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/perf_event.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index e85cd1c0eaf3..7b5406e3288d 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -704,6 +704,7 @@ struct perf_event { /* The cumulative AND of all event_caps for events in this group. */ int group_caps; + unsigned int group_generation; struct perf_event *group_leader; /* * event->pmu will always point to pmu in which this event belongs. |