diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-10-04 08:35:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-10-04 08:35:29 -0700 |
| commit | a27611f8994c9a4772156432badb533af33fd32d (patch) | |
| tree | 3be31c125e2364108e97ed71a17753093c4fa324 /include | |
| parent | 1c915d6007fab5b87a8c2516dfd37dd614875f9c (diff) | |
| parent | 357e8a77a501d96c9517f01f4a211eed5e9c9184 (diff) | |
| download | linux-stable-a27611f8994c9a4772156432badb533af33fd32d.tar.gz linux-stable-a27611f8994c9a4772156432badb533af33fd32d.zip | |
Merge tag 'perf-urgent-2026-10-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf events fixes from Ingo Molnar:
- Fix race between perf_event_exit_task() and perf_pending_task()
(Luo Gengkun)
- Fix perf header output management regressions (Ian Rogers)
- Require kernel access for text poke events (Zhengchuan Liang)
* tag 'perf-urgent-2026-10-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Require kernel access for text poke events
perf: Replace perf_event_header__init_id with full header init
perf: Fix race between perf_event_exit_task() and perf_pending_task()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/perf_event.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 915c6fd3f..2d5e76878 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1506,9 +1506,10 @@ is_default_overflow_handler(struct perf_event *event) } extern void -perf_event_header__init_id(struct perf_event_header *header, - struct perf_sample_data *data, - struct perf_event *event); +perf_event_header__init(struct perf_event_header *header, + struct perf_sample_data *data, + u32 type, u16 misc, u16 size, + struct perf_event *event); extern void perf_event__output_id_sample(struct perf_event *event, struct perf_output_handle *handle, |