module: fix noreturn attribute for __module_put_and_exit() (bf262dce) · Commits · 戴 / test

__module_put_and_exit() is makred noreturn in module.h declaration, but is lacking the attribute in the definition, which makes some tools (such as sparse) unhappy. Amend the definition with the attribute as well (and reformat the declaration so that it uses more common format). Signed-off-by:

Jiri Kosina <jkosina@suse.cz> Signed-off-by:

Rusty Russell <rusty@rustcorp.com.au>

include/linux/module.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -575,8 +575,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 __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

kernel/module.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -336,7 +336,7 @@ 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 __noreturn __module_put_and_exit(struct module *mod, long code)
		{
		module_put(mod);
		do_exit(code);

Admin message