Commit 00a8bf85 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

tracing/function-graph-tracer: fix merge 



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

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5752674e

kernel/trace/trace_functions_graph.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -589,7 +589,7 @@ print_graph_entry(struct ftrace_graph_ent_entry *field, struct trace_seq *s, 




	/* Proc */

	/* Proc */

	if (tracer_flags.val & TRACE_GRAPH_PRINT_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)

		if (ret == TRACE_TYPE_PARTIAL_LINE)

			return TRACE_TYPE_PARTIAL_LINE;

			return TRACE_TYPE_PARTIAL_LINE;