diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-03 09:23:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-03 09:23:23 -0700 |
| commit | e92d51aff5068b96346a45e5118680b3bc3490c2 (patch) | |
| tree | 63c29d6c4672265a9ca791754258606b89bd4b85 /include/linux/perf_event.h | |
| parent | d0d6ab53c9abd7dd1070f43a0455328874127ba8 (diff) | |
| parent | 75e8387685f6c65feb195a4556110b58f852b848 (diff) | |
| download | lwn-e92d51aff5068b96346a45e5118680b3bc3490c2.tar.gz lwn-e92d51aff5068b96346a45e5118680b3bc3490c2.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Thomas Gleixner:
- Prevent a potential inconistency in the perf user space access which
might lead to evading sanity checks.
- Prevent perf recording function trace entries twice
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/ftrace: Fix double traces of perf on ftrace:function
perf/core: Fix potential double-fetch bug
Diffstat (limited to 'include/linux/perf_event.h')
| -rw-r--r-- | include/linux/perf_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index b14095bcf4bb..c00cd4b02f32 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1201,7 +1201,7 @@ extern void perf_event_init(void); extern void perf_tp_event(u16 event_type, u64 count, void *record, int entry_size, struct pt_regs *regs, struct hlist_head *head, int rctx, - struct task_struct *task); + struct task_struct *task, struct perf_event *event); extern void perf_bp_event(struct perf_event *event, void *data); #ifndef perf_misc_flags |