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

[Sasha Levin]

On Thu, Sep 23, 2021 at 12:35:03PM +0200, Greg Kroah-Hartman wrote:
> On Wed, Sep 22, 2021 at 10:02:42AM -0700, Florian Fainelli 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);
      |         ^~~~~~~~~~~~~~~~~~~
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.

--
Thanks,
Sasha