aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-19 07:01:37 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-19 07:01:37 -0500
commit00a8bf859331e349713274825e6fbf20bf2ac15a (patch)
tree09a26efd9f8c79c2fc4bead9d6adc18cd2ea6de9
parent5752674e140db5bce08c6bc60021a9bc3b960800 (diff)
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.c2
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,
589 589
590 /* Proc */ 590 /* Proc */
591 if (tracer_flags.val & TRACE_GRAPH_PRINT_PROC) { 591 if (tracer_flags.val & TRACE_GRAPH_PRINT_PROC) {
592 ret = print_graph_proc(s, pid); 592 ret = print_graph_proc(s, ent->pid);
593 if (ret == TRACE_TYPE_PARTIAL_LINE) 593 if (ret == TRACE_TYPE_PARTIAL_LINE)
594 return TRACE_TYPE_PARTIAL_LINE; 594 return TRACE_TYPE_PARTIAL_LINE;
595 595