* [PATCH -next] modules: Fix up build when CONFIG_MODULE_UNLOAD=n.
@ 2009-04-09 15:49 Paul Mundt
2009-04-14 6:26 ` Paul Mundt
0 siblings, 1 reply; 6+ messages in thread
From: Paul Mundt @ 2009-04-09 15:49 UTC (permalink / raw)
To: linux-next
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)
{
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH -next] modules: Fix up build when CONFIG_MODULE_UNLOAD=n.
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
2009-04-14 7:27 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Paul Mundt @ 2009-04-14 6:26 UTC (permalink / raw)
To: linux-next, Stephen Rothwell
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH -next] modules: Fix up build when CONFIG_MODULE_UNLOAD=n.
2009-04-14 6:26 ` Paul Mundt
@ 2009-04-14 7:27 ` Stephen Rothwell
2009-04-14 7:46 ` Paul Mundt
2009-04-14 22:19 ` James Morris
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-04-14 7:27 UTC (permalink / raw)
To: James Morris; +Cc: linux-next, Paul Mundt, Kees Cook, Rusty Russell
On Tue, 14 Apr 2009 15:26:47 +0900 Paul Mundt <lethal@linux-sh.org> 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 <lethal@linux-sh.org>
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 <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)
{
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH -next] modules: Fix up build when CONFIG_MODULE_UNLOAD=n.
2009-04-14 7:27 ` Stephen Rothwell
@ 2009-04-14 7:46 ` Paul Mundt
2009-04-14 22:19 ` James Morris
1 sibling, 0 replies; 6+ messages in thread
From: Paul Mundt @ 2009-04-14 7:46 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: James Morris, linux-next, Kees Cook, Rusty Russell
On Tue, Apr 14, 2009 at 05:27:18PM +1000, Stephen Rothwell wrote:
> On Tue, 14 Apr 2009 15:26:47 +0900 Paul Mundt <lethal@linux-sh.org> 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 ...)
>
Oh, I thought I had, I guess I was a bit too hasty with the the send button..
sorry about that!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH -next] modules: Fix up build when CONFIG_MODULE_UNLOAD=n.
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
1 sibling, 1 reply; 6+ messages in thread
From: James Morris @ 2009-04-14 22:19 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Paul Mundt, Kees Cook, Rusty Russell
On Tue, 14 Apr 2009, Stephen Rothwell wrote:
> On Tue, 14 Apr 2009 15:26:47 +0900 Paul Mundt <lethal@linux-sh.org> wrote:
> >
> > This is still broken in today's -next..
>
> James, can we have this fixed, please?
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH -next] modules: Fix up build when CONFIG_MODULE_UNLOAD=n.
2009-04-14 22:19 ` James Morris
@ 2009-04-15 1:28 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-04-15 1:28 UTC (permalink / raw)
To: James Morris; +Cc: linux-next, Paul Mundt, Kees Cook, Rusty Russell
[-- Attachment #1: Type: text/plain, Size: 631 bytes --]
Hi James,
On Wed, 15 Apr 2009 08:19:59 +1000 (EST) James Morris <jmorris@namei.org> wrote:
>
> On Tue, 14 Apr 2009, Stephen Rothwell wrote:
>
> > On Tue, 14 Apr 2009 15:26:47 +0900 Paul Mundt <lethal@linux-sh.org> wrote:
> > >
> > > This is still broken in today's -next..
> >
> > James, can we have this fixed, please?
>
> Applied to
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
Thanks.
Unfortunately, you applied it with me as the author instead of Paul ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-04-15 1:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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
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).