[for-next][PATCH 06/10] tracing: Move ftrace_event_file() out of DYNAMIC_FTRACE ifdef

Steven Rostedt
2013-12-23T21:41:00Z

[-- Attachment #1: 0006-tracing-Move-ftrace_event_file-out-of-DYNAMIC_FTRACE.patch --]
[-- Type: text/plain, Size: 1492 bytes --]

From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>

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>
---
kernel/trace/trace_events.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 9a974bd..e71ffd4 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)
{
--
1.8.4.3