summaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2015-04-29 09:57:36 -0400
committerSteven Rostedt <rostedt@goodmis.org>2015-05-13 14:05:05 -0400
commit2167ae727215714d25fe44945cdbe6157f7ac481 (patch)
treee4856e8b38501cc720d83f3bf0b5539c588eb816 /include/trace
parentf267caab44451baa70d25fa3191a68bb79ad1b08 (diff)
downloadlinux-stable-2167ae727215714d25fe44945cdbe6157f7ac481.tar.gz
linux-stable-2167ae727215714d25fe44945cdbe6157f7ac481.tar.bz2
linux-stable-2167ae727215714d25fe44945cdbe6157f7ac481.zip
tracing: Rename trace/ftrace.h to trace/trace_events.h
The name "ftrace" really refers to the function hook infrastructure. It is not about the TRACE_EVENT() macros. The file trace/ftrace.h was originally written to be mostly focused toward the "ftrace" code (that in kernel/trace/) but ended up being generic and used by perf and others. Rename the file to be less confusing about what infrastructure it belongs to. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/define_trace.h2
-rw-r--r--include/trace/trace_events.h (renamed from include/trace/ftrace.h)0
2 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
index 02e1003568a4..b13ba2fc76f7 100644
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
@@ -87,7 +87,7 @@
#define DECLARE_TRACE(name, proto, args)
#ifdef CONFIG_EVENT_TRACING
-#include <trace/ftrace.h>
+#include <trace/trace_events.h>
#endif
#undef TRACE_EVENT
diff --git a/include/trace/ftrace.h b/include/trace/trace_events.h
index 37d4b10b111d..37d4b10b111d 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/trace_events.h