This patch fixes a sparse warning about noreturn attribute only featuring in module.h
kernel/module.c:212:6: error: symbol '__module_put_and_exit' redeclared with different type (originally declared at include/linux/module.h:449)- different modifiers Cc: Rusty Russell <[email protected]> Cc: Andrew Morton <[email protected]> Signed-off-by: Fabian Frederick <[email protected]> --- include/linux/module.h | 4 ++-- kernel/module.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/module.h b/include/linux/module.h index f520a76..05ab8f3 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -446,8 +446,8 @@ int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *, unsigned long), void *data); -extern void __module_put_and_exit(struct module *mod, long code) - __attribute__((noreturn)); +extern void __attribute__((noreturn)) __module_put_and_exit(struct module *mod, + long code); #define module_put_and_exit(code) __module_put_and_exit(THIS_MODULE, code) #ifdef CONFIG_MODULE_UNLOAD diff --git a/kernel/module.c b/kernel/module.c index 079c461..7d78872 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -209,7 +209,8 @@ static inline void add_taint_module(struct module *mod, unsigned flag, * A thread that wants to hold a reference to a module only while it * is running can call this to safely exit. nfsd and lockd use this. */ -void __module_put_and_exit(struct module *mod, long code) +void __attribute__((noreturn)) __module_put_and_exit(struct module *mod, + long code) { module_put(mod); do_exit(code); -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
