Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932946AbcCQI7J (ORCPT ); Thu, 17 Mar 2016 04:59:09 -0400 Received: from mx2.suse.de ([195.135.220.15]:33219 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753583AbcCQI7C (ORCPT ); Thu, 17 Mar 2016 04:59:02 -0400 Date: Thu, 17 Mar 2016 09:59:00 +0100 (CET) From: Jiri Kosina X-X-Sender: jkosina@pobox.suse.cz To: Rusty Russell cc: linux-kernel@vger.kernel.org, Andrew Morton Subject: [PATCH] module: fix noreturn attribute for __module_put_and_exit() Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1618 Lines: 43 __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 --- 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