On Mon, 24 Feb 2014 20:00:01 +0100 Jiri Slaby <[email protected]> wrote:
> 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) > ^ > Add an ifdef block with CONFIG_DYNAMIC_FTRACE around that function as > it is used solely from the dynamic function tracing functions. > > Signed-off-by: Jiri Slaby <[email protected]> > Cc: Steven Rostedt <[email protected]> > Cc: Frederic Weisbecker <[email protected]> > Cc: Ingo Molnar <[email protected]> > --- > kernel/trace/ftrace.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c > index 5bd70e8b09b0..34b1de9390af 100644 > --- a/kernel/trace/ftrace.c > +++ b/kernel/trace/ftrace.c > @@ -237,10 +237,12 @@ static int control_ops_alloc(struct ftrace_ops *ops) > return 0; > } > > +#ifdef CONFIG_DYNAMIC_FTRACE > static void control_ops_free(struct ftrace_ops *ops) > { > free_percpu(ops->disabled); > } > +#endif I've pulled in all your patches up to this one. But instead of adding another #ifdef CONFIG_DYNAMIC_FTRACE, please just move the function into the block that it's used in. Just resend this patch. The others are already in my 3.15 queue. Thanks, -- Steve > > static void update_global_ops(void) > { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
