From: Ingo Molnar Date: Thu, 19 Feb 2009 12:01:37 +0000 (+0100) Subject: tracing/function-graph-tracer: fix merge X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=00a8bf859331e349713274825e6fbf20bf2ac15a;p=linux-2.6-omap-h63xx.git tracing/function-graph-tracer: fix merge Merge artifact: pid got changed to ent->pid meanwhile. Signed-off-by: Ingo Molnar --- diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 8f4004a00b4..c009553a8e8 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;