diff options
| author | Kees Cook <keescook@chromium.org> | 2016-07-25 13:50:36 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2016-07-25 13:50:36 -0700 |
| commit | 74e630a7582e6b3cb39559d712a0049f08dea8a0 (patch) | |
| tree | 98a752412dcfc74d802024c1d9e8c541b93174f9 /drivers/base/module.c | |
| parent | 35da60941e44dbf57868e67686dd24cc1a33125a (diff) | |
| parent | 523d939ef98fd712632d93a5a2b588e477a7565e (diff) | |
Merge tag 'v4.7' into for-linus/pstore
Linux 4.7
Diffstat (limited to 'drivers/base/module.c')
| -rw-r--r-- | drivers/base/module.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/base/module.c b/drivers/base/module.c index db930d3ee312..2a215780eda2 100644 --- 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) { - 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) |