diff --git a/[refs] b/[refs] index 4d762f5e5246..867ff55fcc3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecfcc53fef3c357574bb6143dce6631e6d56295c +refs/heads/master: 19e4529ee7345079eeacc8e40cf69a304a64dc23 diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c index eeb3f7b1383c..ee7ab612dafa 100644 --- a/trunk/kernel/module.c +++ b/trunk/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) {