diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-14 17:27:18 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-04-15 08:17:31 +1000 |
| commit | 19e4529ee7345079eeacc8e40cf69a304a64dc23 (patch) | |
| tree | 5f08c1803c10178373468e1fd3e24a91092cb7a1 | |
| parent | ecfcc53fef3c357574bb6143dce6631e6d56295c (diff) | |
| download | linux-3.10-19e4529ee7345079eeacc8e40cf69a304a64dc23.tar.gz linux-3.10-19e4529ee7345079eeacc8e40cf69a304a64dc23.tar.bz2 linux-3.10-19e4529ee7345079eeacc8e40cf69a304a64dc23.zip | |
modules: Fix up build when CONFIG_MODULE_UNLOAD=n.
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>
Signed-off-by: James Morris <jmorris@namei.org>
| -rw-r--r-- | kernel/module.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/module.c b/kernel/module.c index eeb3f7b1383..ee7ab612daf 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -71,6 +71,9 @@ static DEFINE_MUTEX(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); @@ -778,9 +781,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) { |