diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-12-20 23:23:05 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-12-21 22:02:17 -0500 |
| commit | 2875a08b2d1da7bae58fc01badb9b0ef1e8fc1a4 (patch) | |
| tree | 91e68035b03d828649428882414e09b44026783c /kernel/trace | |
| parent | 7862ad1846e994574cb47dc503cc2b1646ea6593 (diff) | |
| download | linux-2875a08b2d1da7bae58fc01badb9b0ef1e8fc1a4.tar.bz2 | |
tracing: Move ftrace_event_file() out of DYNAMIC_FTRACE ifdef
Now that event triggers use ftrace_event_file(), it needs to be outside
the #ifdef CONFIG_DYNAMIC_FTRACE, as it can now be used when that is
not defined.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_events.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 9a974bd843d4..e71ffd4eccb5 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -1855,19 +1855,6 @@ __trace_add_event_dirs(struct trace_array *tr) } } -#ifdef CONFIG_DYNAMIC_FTRACE - -/* Avoid typos */ -#define ENABLE_EVENT_STR "enable_event" -#define DISABLE_EVENT_STR "disable_event" - -struct event_probe_data { - struct ftrace_event_file *file; - unsigned long count; - int ref; - bool enable; -}; - struct ftrace_event_file * find_event_file(struct trace_array *tr, const char *system, const char *event) { @@ -1891,6 +1878,19 @@ find_event_file(struct trace_array *tr, const char *system, const char *event) return NULL; } +#ifdef CONFIG_DYNAMIC_FTRACE + +/* Avoid typos */ +#define ENABLE_EVENT_STR "enable_event" +#define DISABLE_EVENT_STR "disable_event" + +struct event_probe_data { + struct ftrace_event_file *file; + unsigned long count; + int ref; + bool enable; +}; + static void event_enable_probe(unsigned long ip, unsigned long parent_ip, void **_data) { |