Re: [PATCH stable 4.9 v2 0/4] ARM: ftrace MODULE_PLTS warning

[Alexander Sverdlin]

Hi Sasha,

On 24/09/2021 13:52, Sasha Levin wrote:
>>> This patch series is present in v5.14 and fixes warnings seen at insmod
>>> with FTRACE and MODULE_PLTS enabled on ARM/Linux.
>>
>> All now queued up, thanks.
> 
> Looks like 4.19 and older break the build:
> 
> arch/arm/kernel/ftrace.c: In function 'ftrace_update_ftrace_func':
> arch/arm/kernel/ftrace.c:157:9: error: too few arguments to function 'ftrace_call_replace'
>   157 |   new = ftrace_call_replace(pc, (unsigned long)func);
>       |         ^~~~~~~~~~~~~~~~~~~

in principle you can add ", true" as a third argument in all these ftrace_call_replace()
call-sites which still have two args.

> arch/arm/kernel/ftrace.c:99:22: note: declared here
>    99 | static unsigned long ftrace_call_replace(unsigned long pc, unsigned long addr,
>       |                      ^~~~~~~~~~~~~~~~~~~
> arch/arm/kernel/ftrace.c: In function 'ftrace_make_nop':
> arch/arm/kernel/ftrace.c:240:9: error: too few arguments to function 'ftrace_call_replace'
>   240 |   old = ftrace_call_replace(ip, adjust_address(rec, addr));
>       |         ^~~~~~~~~~~~~~~~~~~
> arch/arm/kernel/ftrace.c:99:22: note: declared here
>    99 | static unsigned long ftrace_call_replace(unsigned long pc, unsigned long addr,
>       |                      ^~~~~~~~~~~~~~~~~~~
> make[2]: *** [scripts/Makefile.build:303: arch/arm/kernel/ftrace.o] Error 1
> 
> I've dropped them.

-- 
Best regards,
Alexander Sverdlin.