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/trace_events.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/trace_events.h')
| -rw-r--r-- | include/linux/trace_events.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index 536c80ff7ad9..5012b524283d 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -508,9 +508,9 @@ void perf_trace_run_bpf_submit(void *raw_data, int size, int rctx, static inline void perf_trace_buf_submit(void *raw_data, int size, int rctx, u16 type, u64 count, struct pt_regs *regs, void *head, - struct task_struct *task) + struct task_struct *task, struct perf_event *event) { - perf_tp_event(type, count, raw_data, size, regs, head, rctx, task); + perf_tp_event(type, count, raw_data, size, regs, head, rctx, task, event); } #endif |