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

Commit 801c29fd authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

function-graph: Fix unused reference to ftrace_set_func() 



The declaration of ftrace_set_func() is at the start of the ftrace.c file
and wrapped with a #ifdef CONFIG_FUNCTION_GRAPH condition. If function
graph tracing is enabled but CONFIG_DYNAMIC_FTRACE is not, a warning
about that function being declared static and unused is given.

This really should have been placed within the CONFIG_FUNCTION_GRAPH
condition that uses ftrace_set_func().

Moving the declaration down fixes the warning and makes the code cleaner.

Reported-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent ae1f3038

kernel/trace/ftrace.c

+2 −4
Original line number Diff line number Diff line
@@ -85,10 +85,6 @@ ftrace_func_t ftrace_trace_function __read_mostly = ftrace_stub; 
ftrace_func_t __ftrace_trace_function __read_mostly = ftrace_stub;

ftrace_func_t ftrace_pid_function __read_mostly = ftrace_stub;



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

static int ftrace_set_func(unsigned long *array, int *idx, char *buffer);

#endif



static void ftrace_list_func(unsigned long ip, unsigned long parent_ip)

{

	struct ftrace_ops *op = ftrace_list;
@@ -2300,6 +2296,8 @@ __setup("ftrace_filter=", set_ftrace_filter); 


#ifdef CONFIG_FUNCTION_GRAPH_TRACER

static char ftrace_graph_buf[FTRACE_FILTER_SIZE] __initdata;

static int ftrace_set_func(unsigned long *array, int *idx, char *buffer);



static int __init set_graph_function(char *str)

{

	strlcpy(ftrace_graph_buf, str, FTRACE_FILTER_SIZE);