On Fri, Feb 07, 2014 at 02:39:52PM -0500, Steven Rostedt wrote:
> On Fri, 7 Feb 2014 10:04:24 +0000
> Luis Henriques <luis.henriques@xxxxxxxxxxxxx> wrote:
>
>
> > > --- a/kernel/trace/ftrace.c
> > > +++ b/kernel/trace/ftrace.c
> > > @@ -278,6 +278,12 @@ static void update_global_ops(void)
> > > global_ops.func = func;
> > > }
> > >
> > > +#ifdef CONFIG_FUNCTION_GRAPH_TRACER
> > > +static void update_function_graph_func(void);
> > > +#else
> > > +static inline void update_function_graph_func(void) { }
> > > +#endif
> > > +
> > > static void update_ftrace_function(void)
> > > {
> > > ftrace_func_t func;
> > > @@ -325,6 +331,8 @@ static int remove_ftrace_ops(struct ftra
> > > {
> > > struct ftrace_ops **p;
> > >
> > > + update_function_graph_func();
> > > +
> >
> > Hi Greg,
> >
> > This change doesn't look correct to me. The original commit changes
> > function update_ftrace_function(), not remove_ftrace_ops().
> >
>
> Yeah that's incorrect. But there were some failures to other patches
> due to a missing one I forgot to label stable.
>
> Anyway, I'm going to post 3 patches that should fix the problems
> (hopefully, I did run them through some of my tests). I'll send them as
> a reply to this email.
Ok, I've queued these up for 3.10, and added the additional patch to
3.13 and 3.12. If you want these in any other trees, please let me
know.
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html