2009-04-06 13:15:19

by Alexander Beregalov

[permalink] [raw]
Subject: [PATCH next] module.c: fix build breakage when !MODULE_UNLOAD

Fix this build error when CONFIG_MODULE_UNLOAD is not set:
kernel/module.c: In function 'sys_init_module':
kernel/module.c:2401: error: 'modules_disabled' undeclared

Signed-off-by: Alexander Beregalov <[email protected]>
---

kernel/module.c | 6 +++---
1 files 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)
{