Re: [PATCH 1/1] ftrace: fix function graph tracer

[Steven Rostedt]

On Fri, 2012-02-17 at 21:39 +0530, Rajesh Bhagat wrote:

> ---
>  kernel/trace/ftrace.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 683d559..dc2de98 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -219,7 +219,8 @@ static void update_ftrace_function(void)
>  #else
>     __ftrace_trace_function = func;
>  #endif
> -   ftrace_trace_function = ftrace_test_stop_func;
> +   ftrace_trace_function =
> +       (func == ftrace_stub) ? func : ftrace_test_stop_func;
>  #endif
>  }

Nice catch! This should also go into stable. When I get back from the
conference I'll start getting it upstream.

Thanks,

-- Steve


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/