diff options
| author | Peter Zijlstra | 2017-10-11 09:45:29 +0200 |
|---|---|---|
| committer | Steven Rostedt (VMware) | 2017-10-17 00:11:02 +0200 |
| commit | 8fd0fbbe8888f295eb34172a7e47bf7d3a0a4687 (patch) | |
| tree | 86e13d1e79b9c407f4d142f12ea43fc1b008f617 /include/linux/perf_event.h | |
| parent | tracing, dma-buf: Remove unused trace event dma_fence_annotate_wait_on (diff) | |
| download | kernel-qcow2-linux-8fd0fbbe8888f295eb34172a7e47bf7d3a0a4687.tar.gz kernel-qcow2-linux-8fd0fbbe8888f295eb34172a7e47bf7d3a0a4687.tar.xz kernel-qcow2-linux-8fd0fbbe8888f295eb34172a7e47bf7d3a0a4687.zip | |
perf/ftrace: Revert ("perf/ftrace: Fix double traces of perf on ftrace:function")
Revert commit:
75e8387685f6 ("perf/ftrace: Fix double traces of perf on ftrace:function")
The reason I instantly stumbled on that patch is that it only addresses the
ftrace situation and doesn't mention the other _5_ places that use this
interface. It doesn't explain why those don't have the problem and if not, why
their solution doesn't work for ftrace.
It doesn't, but this is just putting more duct tape on.
Link: http://lkml.kernel.org/r/20171011080224.200565770@infradead.org
Cc: Zhou Chengming <zhouchengming1@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
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 8e22f24ded6a..569d1b54e201 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1184,7 +1184,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 perf_event *event); + struct task_struct *task); extern void perf_bp_event(struct perf_event *event, void *data); #ifndef perf_misc_flags |