Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c36595e authored by Colin Cross's avatar Colin Cross Committed by Russell King
Browse files

ARM: 7468/1: ftrace: Trace function entry before updating index 



Commit 722b3c74 modified x86 ftrace to
avoid tracing all functions called from irqs when function graph was
used with a filter.  Port the same fix to ARM.

Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarColin Cross <ccross@android.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a76d7bd9

arch/arm/kernel/ftrace.c

+9 −8
Original line number Diff line number Diff line
@@ -179,19 +179,20 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, 
	old = *parent;

	*parent = return_hooker;



	err = ftrace_push_return_trace(old, self_addr, &trace.depth,

				       frame_pointer);

	if (err == -EBUSY) {

		*parent = old;

		return;

	}



	trace.func = self_addr;

	trace.depth = current->curr_ret_stack + 1;



	/* Only trace if the calling function expects to */

	if (!ftrace_graph_entry(&trace)) {

		current->curr_ret_stack--;

		*parent = old;

		return;

	}



	err = ftrace_push_return_trace(old, self_addr, &trace.depth,

				       frame_pointer);

	if (err == -EBUSY) {

		*parent = old;

		return;

	}

}