diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-19 13:01:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-19 13:01:37 +0100 |
| commit | 00a8bf859331e349713274825e6fbf20bf2ac15a (patch) | |
| tree | 09a26efd9f8c79c2fc4bead9d6adc18cd2ea6de9 | |
| parent | Documentation/ftrace.txt: update (diff) | |
| download | linux-00a8bf859331e349713274825e6fbf20bf2ac15a.tar.xz linux-00a8bf859331e349713274825e6fbf20bf2ac15a.zip | |
tracing/function-graph-tracer: fix merge
Merge artifact: pid got changed to ent->pid meanwhile.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | kernel/trace/trace_functions_graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 8f4004a00b4e..c009553a8e81 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -589,7 +589,7 @@ print_graph_entry(struct ftrace_graph_ent_entry *field, struct trace_seq *s, /* Proc */ if (tracer_flags.val & TRACE_GRAPH_PRINT_PROC) { - ret = print_graph_proc(s, pid); + ret = print_graph_proc(s, ent->pid); if (ret == TRACE_TYPE_PARTIAL_LINE) return TRACE_TYPE_PARTIAL_LINE; |