aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-03-10 11:43:52 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-10 18:01:19 -0700
commit6c5db22d280302c33dafb309c25bf2841fb99c37 (patch)
tree0d3711b8a32646f52eca5015447256a30bc96a88
parent2668db9111bb1a6ab5a54f41f703179f35c7d098 (diff)
modules: fix module waiting for dependent modules' init
Commit c9a3ba55 (module: wait for dependent modules doing init.) didn't quite work because the waiter holds the module lock, meaning that the state of the module it's waiting for cannot change. Fortunately, it's fairly simple to update the state outside the lock and do the wakeup. Thanks to Jan Glauber for tracking this down and testing (qdio and qeth). Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: Jan Glauber <jang@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/module.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/module.c b/kernel/module.c
index be4807fb90e4..68d05d2f4d8a 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2179,9 +2179,11 @@ sys_init_module(void __user *umod,
return ret;
}
- /* Now it's a first class citizen! */
- mutex_lock(&module_mutex);
+ /* Now it's a first class citizen! Wake up anyone waiting for it. */
mod->state = MODULE_STATE_LIVE;
+ wake_up(&module_wq);
+
+ mutex_lock(&module_mutex);
/* Drop initial reference. */
module_put(mod);
unwind_remove_table(mod->unwind_info, 1);
@@ -2190,7 +2192,6 @@ sys_init_module(void __user *umod,
mod->init_size = 0;
mod->init_text_size = 0;
mutex_unlock(&module_mutex);
- wake_up(&module_wq);
return 0;
}

Privacy Policy