Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccdb5946 authored by Robert Elliott's avatar Robert Elliott Committed by Steven Rostedt
Browse files

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: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 4449bf92

kernel/trace/trace.h

+1 −0
Original line number Diff line number Diff line
@@ -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)

kernel/trace/trace_functions_graph.c

+0 −9
Original line number Diff line number Diff line
@@ -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[] = {