tracing: Rename ftrace_event.h to trace_events.h

The term "ftrace" is really the infrastructure of the function hooks,
and not the trace events. Rename ftrace_event.h to trace_events.h to
represent the trace_event infrastructure and decouple the term ftrace
from it.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/arch/x86/kvm/mmutrace.h b/arch/x86/kvm/mmutrace.h
index ce463a9cc8fb253d426bfabb9bb786a69a26fc55..5a24b846a1cb8cf2d7d66bcdb275c50c2f483626 100644 (file)
--- a/arch/x86/kvm/mmutrace.h
+++ b/arch/x86/kvm/mmutrace.h
@@ -2,7 +2,7 @@
 #define _TRACE_KVMMMU_H
 
 #include <linux/tracepoint.h>
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvmmmu

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index ce741b8650f6ece694fb47e1750d153291a1803f..19788d5b1109da585b2d77b8818dfbe05558fd9b 100644 (file)
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -28,7 +28,7 @@
 #include <linux/vmalloc.h>
 #include <linux/highmem.h>
 #include <linux/sched.h>
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 #include <linux/slab.h>
 
 #include <asm/perf_event.h>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index f7b61687bd79facc3f6ed0339b68ecf3fcf43aed..9b5adf4860c274801af798b7ecd62bdb9ba8b1aa 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -28,7 +28,7 @@
 #include <linux/sched.h>
 #include <linux/moduleparam.h>
 #include <linux/mod_devicetable.h>
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 #include <linux/slab.h>
 #include <linux/tboot.h>
 #include <linux/hrtimer.h>

diff --git a/include/linux/ftrace_event.h b/include/linux/trace_events.h
similarity index 100%
rename from include/linux/ftrace_event.h
rename to include/linux/trace_events.h

diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index d19840b0cac844c8cd2fca6f4dac5d4bc62c75a3..a9c88d0a1ca8765d326deb798ef811dab7ebdbe4 100644 (file)
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -7,7 +7,7 @@
 #include <linux/ktime.h>
 #include <linux/pm_qos.h>
 #include <linux/tracepoint.h>
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 
 #define TPS(x)  tracepoint_string(x)
 

diff --git a/include/trace/syscall.h b/include/trace/syscall.h
index 9674145e2f6abf910b88b6be6c7b66b4d56dc152..58df48c9d04e5e64d61ff73fdc9e45daaf2c2e02 100644 (file)
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@@ -3,7 +3,7 @@
 
 #include <linux/tracepoint.h>
 #include <linux/unistd.h>
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 #include <linux/thread_info.h>
 
 #include <asm/ptrace.h>

diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h
index 19af616e9dbd2c044f5557da820b727d8f567cb1..17d85ca992ee6f43d626cc955d4d97d91857ddeb 100644 (file)
--- a/include/trace/trace_events.h
+++ b/include/trace/trace_events.h
@@ -16,7 +16,7 @@
  * in the structure.
  */
 
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 
 #ifndef TRACE_SYSTEM_VAR
 #define TRACE_SYSTEM_VAR TRACE_SYSTEM

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 81aa3a4ece9f787038027bb4e5a1e456312c1182..e318b1aa8647dd68b54ab8f2fb4ebb5050e25362 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -36,7 +36,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/cgroup.h>
 #include <linux/perf_event.h>
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 #include <linux/hw_breakpoint.h>
 #include <linux/mm_types.h>
 #include <linux/module.h>

diff --git a/kernel/module.c b/kernel/module.c
index 42a1d2afb2173cd3c7c740098dd72d7a52bdb3f8..4db0dbc14031c34b9f4ddc56752726293946853d 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -18,7 +18,7 @@
 */
 #include <linux/export.h>
 #include <linux/moduleloader.h>
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 #include <linux/init.h>
 #include <linux/kallsyms.h>
 #include <linux/file.h>

diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
index 069742d61c68873a3fce7bf5d7df2e77d5a59958..665a4f4d265fdad8a9501127467b14d0aeea9afa 100644 (file)
--- a/kernel/rcu/tiny.c
+++ b/kernel/rcu/tiny.c
@@ -35,7 +35,7 @@
 #include <linux/time.h>
 #include <linux/cpu.h>
 #include <linux/prefetch.h>
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 
 #include "rcu.h"
 

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 8cf7304b2867f5a113807afb0bd5dc0a3bd3cfc0..45a6141e19be8c1f55f1a00d7d9301059a5e0bc3 100644 (file)
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -54,7 +54,7 @@
 #include <linux/delay.h>
 #include <linux/stop_machine.h>
 #include <linux/random.h>
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 #include <linux/suspend.h>
 
 #include "tree.h"

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 0315d43176d80d264c37f22ba403a5089a124c48..a4bdd63219bec6538fd10cd6ee2cd3dba2abee68 100644 (file)
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 Steven Rostedt <srostedt@redhat.com>
  */
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 #include <linux/ring_buffer.h>
 #include <linux/trace_clock.h>
 #include <linux/trace_seq.h>

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index d2612016de94f6e7c0762b6edbb6db7311b46d30..c09ecfed57dbfa0229311078070981fdfe953cce 100644 (file)
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -12,7 +12,7 @@
 #include <linux/ftrace.h>
 #include <linux/hw_breakpoint.h>
 #include <linux/trace_seq.h>
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 #include <linux/compiler.h>
 #include <linux/trace_seq.h>
 
@@ -1180,7 +1180,7 @@ struct event_trigger_ops {
  *     commands need to do this if they themselves log to the trace
  *     buffer (see the @post_trigger() member below).  @trigger_type
  *     values are defined by adding new values to the trigger_type
- *     enum in include/linux/ftrace_event.h.
+ *     enum in include/linux/trace_events.h.
  *
  * @post_trigger: A flag that says whether or not this command needs
  *     to have its action delayed until after the current event has

diff --git a/mm/debug.c b/mm/debug.c
index 3eb3ac2fcee7d14627411d6ee2021c02efa17d8d..76089ddf99ea1cba96695010cbcbe9e5a4a90331 100644 (file)
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -7,7 +7,7 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 #include <linux/memcontrol.h>
 
 static const struct trace_print_flags pageflag_names[] = {