On Wed, 22 Feb 2017 08:29:26 +0800
Chunyu Hu <ch...@redhat.com> wrote:

> There is no function 'ftrace_ops_recurs_func' existing in the code, it
> should be ftrace_ops_assist_func. Fix the comment to avoid misleading.

Applied, thanks!

I'm not sure it will go in this merge window. It might, I'll have to
see what else there is.

-- Steve

> 
> Signed-off-by: Chunyu Hu <ch...@redhat.com>
> ---
>  kernel/trace/ftrace.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 0c06093..fd84f2e 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -5487,7 +5487,7 @@ static void ftrace_ops_assist_func(unsigned long ip, 
> unsigned long parent_ip,
>   * Normally the mcount trampoline will call the ops->func, but there
>   * are times that it should not. For example, if the ops does not
>   * have its own recursion protection, then it should call the
> - * ftrace_ops_recurs_func() instead.
> + * ftrace_ops_assist_func() instead.
>   *
>   * Returns the function that the trampoline should call for @ops.
>   */

Reply via email to