Skip to content

Commit

Permalink
ftrace: Fix compilation warning about control_ops_free
Browse files Browse the repository at this point in the history
With CONFIG_DYNAMIC_FTRACE=n, I see a warning:
kernel/trace/ftrace.c:240:13: warning: 'control_ops_free' defined but not used
 static void control_ops_free(struct ftrace_ops *ops)
             ^
Move that function around to an already existing #ifdef
CONFIG_DYNAMIC_FTRACE block as the function is used solely from the
dynamic function tracing functions.

Link: http://lkml.kernel.org/r/1394484131-5107-1-git-send-email-jslaby@suse.cz

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Jiri Slaby authored and Steven Rostedt committed Mar 11, 2014
1 parent 7f11f5e commit db0fbad
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions kernel/trace/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,6 @@ static int control_ops_alloc(struct ftrace_ops *ops)
return 0;
}

static void control_ops_free(struct ftrace_ops *ops)
{
free_percpu(ops->disabled);
}

static void update_global_ops(void)
{
ftrace_func_t func = ftrace_global_list_func;
Expand Down Expand Up @@ -2100,6 +2095,11 @@ static ftrace_func_t saved_ftrace_func;
static int ftrace_start_up;
static int global_start_up;

static void control_ops_free(struct ftrace_ops *ops)
{
free_percpu(ops->disabled);
}

static void ftrace_startup_enable(int command)
{
if (saved_ftrace_func != ftrace_trace_function) {
Expand Down

0 comments on commit db0fbad

Please sign in to comment.