diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 04:34:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 04:34:09 +0100 |
| commit | 2084e0225ed14cc1959c8aa703a3870c95fde4ab (patch) | |
| tree | 818517eb07b585e981ce81c200294a8ec7a8e992 /kernel/trace/trace_functions_graph.c | |
| parent | 4c6ed8f496fe89ff81b3d6e617a531bedfb613e4 (diff) | |
| parent | 5cc985488845ec7227a2c5cfd2fd62cf57fb411a (diff) | |
| download | lwn-2084e0225ed14cc1959c8aa703a3870c95fde4ab.tar.gz lwn-2084e0225ed14cc1959c8aa703a3870c95fde4ab.zip | |
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 8566c14b3e9a..4c388607ed67 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -684,7 +684,7 @@ print_graph_return(struct ftrace_graph_ret *trace, struct trace_seq *s, } static enum print_line_t -print_graph_comment(struct print_entry *trace, struct trace_seq *s, +print_graph_comment(struct bprint_entry *trace, struct trace_seq *s, struct trace_entry *ent, struct trace_iterator *iter) { int i; @@ -781,8 +781,8 @@ print_graph_function(struct trace_iterator *iter) trace_assign_type(field, entry); return print_graph_return(&field->ret, s, entry, iter); } - case TRACE_PRINT: { - struct print_entry *field; + case TRACE_BPRINT: { + struct bprint_entry *field; trace_assign_type(field, entry); return print_graph_comment(field, s, entry, iter); } |