base: make module_create_drivers_dir race-free

[pandora-kernel.git] / drivers / base / module.c

diff --git a/drivers/base/module.c b/drivers/base/module.c
index db930d3..2a21578 100644 (file)
--- a/drivers/base/module.c
+++ b/drivers/base/module.c
@@ -24,10 +24,12 @@ static char *make_driver_name(struct device_driver *drv)
 
 static void module_create_drivers_dir(struct module_kobject *mk)
 {
 
 static void module_create_drivers_dir(struct module_kobject *mk)
 {

-       if (!mk || mk->drivers_dir)
-               return;
+       static DEFINE_MUTEX(drivers_dir_mutex);

 
 

-       mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);
+       mutex_lock(&drivers_dir_mutex);
+       if (mk && !mk->drivers_dir)
+               mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);
+       mutex_unlock(&drivers_dir_mutex);

 }
 
 void module_add_driver(struct module *mod, struct device_driver *drv)
 }
 
 void module_add_driver(struct module *mod, struct device_driver *drv)