Commit 19e4529e authored by Stephen Rothwell's avatar Stephen Rothwell Committed by James Morris

modules: Fix up build when CONFIG_MODULE_UNLOAD=n.

Commit 3d43321b ("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: default avatarPaul Mundt <>
Signed-off-by: default avatarJames Morris <>
parent ecfcc53f
......@@ -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)
/* Block module loading/unloading? */
int modules_disabled = 0;
SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
unsigned int, flags)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment