aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_functions_graph.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-10 17:55:31 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-10 17:55:31 -0400
commite2b8b2808538a91444e78c7db5a30519cadd09b2 (patch)
tree60c45581817db746bd61670f5c95b19c2661daa0 /kernel/trace/trace_functions_graph.c
parent4dd163a0512eb91bbcf4e66d2f65b8e4042561b3 (diff)
parentef18012b248b47ec9a12c3a83ca5e99782d39c5d (diff)
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace_functions_graph.c')
-rw-r--r--kernel/trace/trace_functions_graph.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 35257be6a9d6..8566c14b3e9a 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -841,12 +841,12 @@ static void graph_trace_close(struct trace_iterator *iter)
841} 841}
842 842
843static struct tracer graph_trace __read_mostly = { 843static struct tracer graph_trace __read_mostly = {
844 .name = "function_graph", 844 .name = "function_graph",
845 .open = graph_trace_open, 845 .open = graph_trace_open,
846 .close = graph_trace_close, 846 .close = graph_trace_close,
847 .wait_pipe = poll_wait_pipe, 847 .wait_pipe = poll_wait_pipe,
848 .init = graph_trace_init, 848 .init = graph_trace_init,
849 .reset = graph_trace_reset, 849 .reset = graph_trace_reset,
850 .print_line = print_graph_function, 850 .print_line = print_graph_function,
851 .print_header = print_graph_headers, 851 .print_header = print_graph_headers,
852 .flags = &tracer_flags, 852 .flags = &tracer_flags,