Re: [PATCH] ftrace: fix function type mismatches

[Steven Rostedt]

On Tue, 15 Oct 2019 09:00:55 -0400
Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:

> +++ b/include/asm-generic/vmlinux.lds.h
> @@ -111,15 +111,22 @@
>  
>  #ifdef CONFIG_FTRACE_MCOUNT_RECORD
>  #ifdef CC_USING_PATCHABLE_FUNCTION_ENTRY
> +/*
> + * Need to also make ftrace_graph_stub point to ftrace_stub
> + * so that the same stub location may have different protocols
> + * and not mess up with C verifiers.
> + */


> diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c
> index 7950a0356042..fa3ce10d0405 100644
> --- a/kernel/trace/fgraph.c
> +++ b/kernel/trace/fgraph.c
> @@ -332,9 +332,14 @@ int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
>  	return 0;
>  }
>  
> +/*
> + * Simply points to ftrace_stub, but with the proper protocol.
> + * Defined by the linker script in linux/vmlinux.lds.h
> + */
> +extern void ftrace_graph_stub(struct ftrace_graph_ret *);
> +


 s/protocol/prototype/g

Will update.

-- Steve