On Sun, 20 Jul 2014 17:18:14 +0200 Oleg Nesterov <o...@redhat.com> wrote:
> global_start_up is read-only and always zero. It seems that 4104d326 > "ftrace: Remove global function list and call function directly" simply > forgot to remove this no longer used variable. > Sure, just after I got done testing my entire 3.17 queue and posted it for linux-next, you decide to send me yet another fix! ;-) Thanks, applied. I'll wait and see what other fixes you send me before I run my 10 hour tests. -- Steve > Signed-off-by: Oleg Nesterov <o...@redhat.com> > --- > kernel/trace/ftrace.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c > index 5b372e3..4586f8d 100644 > --- a/kernel/trace/ftrace.c > +++ b/kernel/trace/ftrace.c > @@ -2053,7 +2053,6 @@ static void ftrace_run_update_code(int command) > > 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) > { > @@ -2117,8 +2116,7 @@ static int ftrace_shutdown(struct ftrace_ops *ops, int > command) > > ftrace_hash_rec_disable(ops, 1); > > - if (!global_start_up) > - ops->flags &= ~FTRACE_OPS_FL_ENABLED; > + ops->flags &= ~FTRACE_OPS_FL_ENABLED; > > command |= FTRACE_UPDATE_CALLS; > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/