Messages in this thread Patch in this message | | | Date | Thu, 3 Jul 2014 09:21:21 -0400 | From | Steven Rostedt <> | Subject | [PATCH] modules: Fix build error in moduleloader.h |
| |
Fengguang Wu's build bot detected that if moduleloader.h is included in a C file (used by ftrace and kprobes to access module_alloc() when available), that it can fail to build if CONFIG_MODULES and CONFIG_MODULES_USE_ELF_REL is not defined.
This is because there's a printk() that dereferences struct module to print the name of the module. But as struct module does not exist when CONFIG_MODULES is not defined we get this error:
include/linux/moduleloader.h: In function 'apply_relocate': >> include/linux/moduleloader.h:48:63: error: dereferencing pointer to incomplete type printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name); ^ Avoid the printk if CONFIG_MODULES is not set.
Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> --- diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h index 560ca53..d9da807 100644 --- a/include/linux/moduleloader.h +++ b/include/linux/moduleloader.h @@ -45,7 +45,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs, unsigned int relsec, struct module *me) { +/* me->name only exists if modules are enabled */ +#ifdef CONFIG_MODULES printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name); +#endif return -ENOEXEC; } #endif
| |