function_graph: Make ftrace_push_return_trace() static (d125f3f8) · Commits · 戴 / test

As all architectures now call function_graph_enter() to do the entry work, no architecture should ever call ftrace_push_return_trace(). Make it static. This is needed to prepare for a fix of a design bug on how the curr_ret_stack is used. Cc: stable@kernel.org Fixes: ("tracing/fgraph: Adjust fgraph depth before calling trace return callback") Reviewed-by:

Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by:

Steven Rostedt (VMware) <rostedt@goodmis.org>

include/linux/ftrace.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -776,9 +776,6 @@ struct ftrace_ret_stack {
		*/
		extern void return_to_handler(void);

		extern int
		ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
		unsigned long frame_pointer, unsigned long *retp);
		extern int
		function_graph_enter(unsigned long ret, unsigned long func,
		unsigned long frame_pointer, unsigned long *retp);

kernel/trace/trace_functions_graph.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ print_graph_duration(struct trace_array *tr, unsigned long long duration,
		struct trace_seq *s, u32 flags);

		/* Add a function return address to the trace stack on thread info.*/
		int
		static int
		ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
		unsigned long frame_pointer, unsigned long *retp)
		{

Admin message