Hi all,
Today's linux-next merge of the ftrace tree got a conflict in:
include/linux/module.h
between commits:
c287c0723329 ("module: switch to execmem API for remapping as RW and restoring ROX")
602df3712979 ("module: drop unused module_writable_address()")
from the tip tree and commit:
186a3d01d596 ("module: Add module_for_each_mod() function")
from the ftrace tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/module.h
index d9a5183a9fe7,9a71dd2cb11f..000000000000
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@@ -771,6 -772,18 +771,8 @@@ static inline bool is_livepatch_module(
void set_module_sig_enforced(void);
-void *__module_writable_address(struct module *mod, void *loc);
-
-static inline void *module_writable_address(struct module *mod, void *loc)
-{
- if (!IS_ENABLED(CONFIG_ARCH_HAS_EXECMEM_ROX) || !mod ||
- mod->state != MODULE_STATE_UNFORMED)
- return loc;
- return __module_writable_address(mod, loc);
-}
-
+ void module_for_each_mod(int(*func)(struct module *mod, void *data), void *data);
+
#else /* !CONFIG_MODULES... */
static inline struct module *__module_address(unsigned long addr)
@@@ -878,6 -891,15 +880,10 @@@ static inline bool module_is_coming(str
{
return false;
}
+
-static inline void *module_writable_address(struct module *mod, void *loc)
-{
- return loc;
-}
-
+ static inline void module_for_each_mod(int(*func)(struct module *mod, void *data), void *data)
+ {
+ }
#endif /* CONFIG_MODULES */
#ifdef CONFIG_SYSFS
Attachment:
pgpS3ceHtWCRs.pgp
Description: OpenPGP digital signature
