tracing: consolidate trace and trace_event headers
commitea20d9293ce423a39717ed4375393129a2e701f9
authorSteven Rostedt <srostedt@redhat.com>
Fri, 10 Apr 2009 12:54:16 +0000 (10 08:54 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Tue, 14 Apr 2009 13:43:40 +0000 (14 09:43 -0400)
tree30cbfd532e6541c17eb69a63044cfe7bce6cf974
parent0a19e53c1514ad8e9c3cbab40c6c3f52c86f403d
tracing: consolidate trace and trace_event headers

Impact: clean up

Neil Horman (et. al.) criticized the way the trace events were broken up
into two files. The reason for that was that ftrace needed to separate out
the declarations from where the #include <linux/tracepoint.h> was used.
It then dawned on me that the tracepoint.h header only needs to define the
TRACE_EVENT macro if it is not already defined.

The solution is simply to test if TRACE_EVENT is defined, and if it is not
then the linux/tracepoint.h header can define it. This change consolidates
all the <traces>.h and <traces>_event_types.h into the <traces>.h file.

Reported-by: Neil Horman <nhorman@tuxdriver.com>
Reported-by: Theodore Tso <tytso@mit.edu>
Reported-by: Jiaying Zhang <jiayingz@google.com>
Cc: Zhaolei <zhaolei@cn.fujitsu.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
include/linux/tracepoint.h
include/trace/irq.h [moved from include/trace/irq_event_types.h with 86% similarity]
include/trace/kmem.h
include/trace/lockdep.h [moved from include/trace/lockdep_event_types.h with 87% similarity]
include/trace/sched.h [moved from include/trace/sched_event_types.h with 97% similarity]
include/trace/skb.h [moved from include/trace/skb_event_types.h with 77% similarity]
include/trace/trace_event_types.h [deleted file]
kernel/trace/events.c
kernel/trace/trace_events_stage_1.h
kernel/trace/trace_events_stage_2.h
kernel/trace/trace_events_stage_3.h