linux-next: build failure after merge of the modules tree

[Stephen Rothwell]

Hi all,

After merging the modules tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

kernel/trace/ftrace.c: In function 'ftrace_lookup_symbols':
kernel/trace/ftrace.c:8316:52: error: passing argument 1 of 'module_kallsyms_on_each_symbol' from incompatible pointer type [-Werror=incompatible-pointer-types]
 8316 |         found_all = module_kallsyms_on_each_symbol(kallsyms_callback, &args);
      |                                                    ^~~~~~~~~~~~~~~~~
      |                                                    |
      |                                                    int (*)(void *, const char *, long unsigned int)
In file included from include/linux/device/driver.h:21,
                 from include/linux/device.h:32,
                 from include/linux/node.h:18,
                 from include/linux/cpu.h:17,
                 from include/linux/stop_machine.h:5,
                 from kernel/trace/ftrace.c:17:
include/linux/module.h:882:48: note: expected 'const char *' but argument is of type 'int (*)(void *, const char *, long unsigned int)'
  882 | int module_kallsyms_on_each_symbol(const char *modname,
      |                                    ~~~~~~~~~~~~^~~~~~~
kernel/trace/ftrace.c:8316:71: error: passing argument 2 of 'module_kallsyms_on_each_symbol' from incompatible pointer type [-Werror=incompatible-pointer-types]
 8316 |         found_all = module_kallsyms_on_each_symbol(kallsyms_callback, &args);
      |                                                                       ^~~~~
      |                                                                       |
      |                                                                       struct kallsyms_data *
include/linux/module.h:883:42: note: expected 'int (*)(void *, const char *, long unsigned int)' but argument is of type 'struct kallsyms_data *'
  883 |                                    int (*fn)(void *, const char *, unsigned long),
      |                                    ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
kernel/trace/ftrace.c:8316:21: error: too few arguments to function 'module_kallsyms_on_each_symbol'
 8316 |         found_all = module_kallsyms_on_each_symbol(kallsyms_callback, &args);
      |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/module.h:882:5: note: declared here
  882 | int module_kallsyms_on_each_symbol(const char *modname,
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  90de88426f3c ("livepatch: Improve the search performance of module_kallsyms_on_each_symbol()")

from the modules tree interatcing with commit

  3640bf8584f4 ("ftrace: Add support to resolve module symbols in ftrace_lookup_symbols")

from the next-next tree.

I have no idea how to easily fix this up, so I have used the modules
tree from next-20221111 for today in the hope someone will send me a fix.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpnw5KLu1Wa4.pgp
Description: OpenPGP digital signature