Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753359AbcCSJXL (ORCPT ); Sat, 19 Mar 2016 05:23:11 -0400 Received: from ozlabs.org ([103.22.144.67]:44599 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752579AbcCSJXA (ORCPT ); Sat, 19 Mar 2016 05:23:00 -0400 From: Rusty Russell To: Jiri Kosina Cc: linux-kernel@vger.kernel.org, Andrew Morton Subject: Re: [PATCH] module: fix noreturn attribute for __module_put_and_exit() In-Reply-To: References: User-Agent: Notmuch/0.20.2 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-pc-linux-gnu) Date: Fri, 18 Mar 2016 13:18:24 +1030 Message-ID: <877fh0mrgn.fsf@rustcorp.com.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1856 Lines: 53 Jiri Kosina writes: > __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 Hi Jiri, While I'm not sure we shouldn't just fix sparse, we should also use __noreturn. Cheers, Rusty. > --- > include/linux/module.h | 4 ++-- > kernel/module.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/linux/module.h b/include/linux/module.h > index 2bb0c30..4cd52b5 100644 > --- a/include/linux/module.h > +++ b/include/linux/module.h > @@ -562,8 +562,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 794ebe8..61f56c2 100644 > --- a/kernel/module.c > +++ b/kernel/module.c > @@ -335,7 +335,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 __attribute__((noreturn)) __module_put_and_exit(struct module *mod, long code) > { > module_put(mod); > do_exit(code); > > -- > Jiri Kosina > SUSE Labs