From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: [PATCH -next] modules: Fix up build when CONFIG_MODULE_UNLOAD=n. Date: Tue, 14 Apr 2009 17:27:18 +1000 Message-ID: <20090414172718.0ad4572c.sfr@canb.auug.org.au> References: <20090409154944.GC7789@linux-sh.org> <20090414062647.GA28905@linux-sh.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:54083 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751327AbZDNH1W (ORCPT ); Tue, 14 Apr 2009 03:27:22 -0400 In-Reply-To: <20090414062647.GA28905@linux-sh.org> Sender: linux-next-owner@vger.kernel.org List-ID: To: James Morris Cc: linux-next@vger.kernel.org, Paul Mundt , Kees Cook , Rusty Russell On Tue, 14 Apr 2009 15:26:47 +0900 Paul Mundt wrote: > > This is still broken in today's -next.. James, can we have this fixed, please? Paul, it would have been helpful if you had cc'd the Author and Committer of the bad commit (or if I had done so ...) Original message below. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ Date: Fri, 10 Apr 2009 00:49:44 +0900 From: Paul Mundt To: linux-next@vger.kernel.org Subject: [PATCH -next] modules: Fix up build when CONFIG_MODULE_UNLOAD=n. Message-ID: <20090409154944.GC7789@linux-sh.org> Commit 3d43321b7015387cfebbe26436d0e9d299162ea1 ("modules: sysctl to block module loading") introduces a modules_disabled variable that is only defined if CONFIG_MODULE_UNLOAD is enabled, despite being used in other places. This moves it up and fixes up the build. CC kernel/module.o kernel/module.c: In function 'sys_init_module': kernel/module.c:2401: error: 'modules_disabled' undeclared (first use in this function) kernel/module.c:2401: error: (Each undeclared identifier is reported only once kernel/module.c:2401: error: for each function it appears in.) make[1]: *** [kernel/module.o] Error 1 make: *** [kernel/module.o] Error 2 Signed-off-by: Paul Mundt --- kernel/module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index 274ab43..5fb0ece 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -73,6 +73,9 @@ DEFINE_MUTEX(module_mutex); EXPORT_SYMBOL_GPL(module_mutex); static LIST_HEAD(modules); +/* Block module loading/unloading? */ +int modules_disabled = 0; + /* Waiting for a module to finish initializing? */ static DECLARE_WAIT_QUEUE_HEAD(module_wq); @@ -782,9 +785,6 @@ static void wait_for_zero_refcount(struct module *mod) mutex_lock(&module_mutex); } -/* Block module loading/unloading? */ -int modules_disabled = 0; - SYSCALL_DEFINE2(delete_module, const char __user *, name_user, unsigned int, flags) {