From: Paul Mundt <lethal@linux-sh.org>
To: linux-next@vger.kernel.org, Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: [PATCH -next] modules: Fix up build when CONFIG_MODULE_UNLOAD=n.
Date: Tue, 14 Apr 2009 15:26:47 +0900 [thread overview]
Message-ID: <20090414062647.GA28905@linux-sh.org> (raw)
In-Reply-To: <20090409154944.GC7789@linux-sh.org>
This is still broken in today's -next..
On Fri, Apr 10, 2009 at 12:49:44AM +0900, Paul Mundt wrote:
> 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 <lethal@linux-sh.org>
>
> ---
>
> 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)
> {
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2009-04-14 6:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-09 15:49 [PATCH -next] modules: Fix up build when CONFIG_MODULE_UNLOAD=n Paul Mundt
2009-04-14 6:26 ` Paul Mundt [this message]
2009-04-14 7:27 ` Stephen Rothwell
2009-04-14 7:46 ` Paul Mundt
2009-04-14 22:19 ` James Morris
2009-04-15 1:28 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090414062647.GA28905@linux-sh.org \
--to=lethal@linux-sh.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).