diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-02-27 08:44:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-02-27 08:44:48 +0100 |
| commit | 83b8450317a1441aef5d110cbc4102d53df9ec02 (patch) | |
| tree | 20bea2fec26dc43d03e42c7231599b8cca321258 /include/linux/perf_event.h | |
| parent | 4ff16c25e2cc48cbe6956e356c38a25ac063a64d (diff) | |
| parent | 5500fa51199aee770ce53718853732600543619e (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Diffstat (limited to 'include/linux/perf_event.h')
| -rw-r--r-- | include/linux/perf_event.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 412b790f5da..92a056f6d18 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -859,6 +859,9 @@ struct perf_event { #ifdef CONFIG_EVENT_TRACING struct ftrace_event_call *tp_event; struct event_filter *filter; +#ifdef CONFIG_FUNCTION_TRACER + struct ftrace_ops ftrace_ops; +#endif #endif #ifdef CONFIG_CGROUP_PERF |