commit 00a8bf859331e349713274825e6fbf20bf2ac15a
author Ingo Molnar <mingo@elte.hu> Thu Feb 19 13:01:37 2009 +0100
committer Ingo Molnar <mingo@elte.hu> Thu Feb 19 13:01:37 2009 +0100
tree 09a26efd9f8c79c2fc4bead9d6adc18cd2ea6de9
parent 5752674e140db5bce08c6bc60021a9bc3b960800

tracing/function-graph-tracer: fix merge

Merge artifact: pid got changed to ent->pid meanwhile.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

kernel/trace/trace_functions_graph.c

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 8f4004a..c009553 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -589,7 +589,7 @@
 
 	/* 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;