tracing: Eliminate duplicate TRACE_GRAPH_PRINT_xx defines

Eliminate duplicate TRACE_GRAPH_PRINT_xx defines
in trace_functions_graph.c that are already in
trace.h.

Add TRACE_GRAPH_PRINT_IRQS to trace.h, which is
the only one that is missing.

Link: http://lkml.kernel.org/p/20140520221031.8359.24733.stgit@beardog.cce.hp.com
Signed-off-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 3b3e09e61f338dba18492ea1875005df35b40d58..68050633255eaecfc5b6aae0148d5dad9bee3f6d 100644 (file)
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -724,6 +724,7 @@ extern unsigned long trace_flags;
 #define TRACE_GRAPH_PRINT_PROC          0x8
 #define TRACE_GRAPH_PRINT_DURATION      0x10
 #define TRACE_GRAPH_PRINT_ABS_TIME      0x20
+#define TRACE_GRAPH_PRINT_IRQS          0x40
 #define TRACE_GRAPH_PRINT_FILL_SHIFT   28
 #define TRACE_GRAPH_PRINT_FILL_MASK    (0x3 << TRACE_GRAPH_PRINT_FILL_SHIFT)
 

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index b86dd4d8c6a67e3e4dc4fafbdf71a4d2ea4bc3f1..af08dd531cb8d8bc2872641d1c101b431e4789ac 100644 (file)
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -38,15 +38,6 @@ struct fgraph_data {
 
 #define TRACE_GRAPH_INDENT     2
 
-/* Flag options */
-#define TRACE_GRAPH_PRINT_OVERRUN      0x1
-#define TRACE_GRAPH_PRINT_CPU          0x2
-#define TRACE_GRAPH_PRINT_OVERHEAD     0x4
-#define TRACE_GRAPH_PRINT_PROC         0x8
-#define TRACE_GRAPH_PRINT_DURATION     0x10
-#define TRACE_GRAPH_PRINT_ABS_TIME     0x20
-#define TRACE_GRAPH_PRINT_IRQS         0x40
-
 static unsigned int max_depth;
 
 static struct tracer_opt trace_opts[] = {