diff options
| author | Linus Torvalds | 2021-10-03 10:32:27 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2021-10-03 10:32:27 -0700 |
| commit | 3a399a2bc465e7fb0e788bfbffefc9399d628a25 (patch) | |
| tree | 31a486ecde8826c9ad2328a7151acbfae228bd03 /include | |
| parent | 52c3c170623d994c468c1ee9cc36c56bbd6d6e56 (diff) | |
| parent | f792565326825ed806626da50c6f9a928f1079c1 (diff) | |
Merge tag 'perf_urgent_for_v5.15_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Borislav Petkov:
- Make sure the destroy callback is reset when a event initialization
fails
- Update the event constraints for Icelake
- Make sure the active time of an event is updated even for inactive
events
* tag 'perf_urgent_for_v5.15_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/core: fix userpage->time_enabled of inactive events
perf/x86/intel: Update event constraints for ICX
perf/x86: Reset destroy callback on event init failure
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/perf_event.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index fe156a8170aa..9b60bb89d86a 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -683,7 +683,9 @@ struct perf_event { /* * timestamp shadows the actual context timing but it can * be safely used in NMI interrupt context. It reflects the - * context time as it was when the event was last scheduled in. + * context time as it was when the event was last scheduled in, + * or when ctx_sched_in failed to schedule the event because we + * run out of PMC. * * ctx_time already accounts for ctx->timestamp. Therefore to * compute ctx_time for a sample, simply add perf_clock(). |