diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2010-08-05 12:59:09 -0600 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-08-05 12:59:10 +0930 |
| commit | 36b0360d17dc3928cc96347a18a3a1cdbb7e506d (patch) | |
| tree | e963d162006f842a475435988eba04a579114f0d /kernel | |
| parent | 8f6d037815466cb25e7de8f00536eca71d94d4c3 (diff) | |
| download | linux-36b0360d17dc3928cc96347a18a3a1cdbb7e506d.tar.bz2 | |
module: fix sysfs cleanup for !CONFIG_SYSFS
Restore the stub module_remove_modinfo_attrs, remove the now-unused
!CONFIG_SYSFS module_sysfs_init.
Also, rename mod_kobject_remove() to mod_sysfs_teardown() as
it is the logical counterpart to mod_sysfs_setup now.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/kernel/module.c b/kernel/module.c index fd8d46c69766..a64b26cf1879 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1504,11 +1504,6 @@ static void mod_sysfs_fini(struct module *mod) #else /* !CONFIG_SYSFS */ -static int mod_sysfs_init(struct module *mod) -{ - return 0; -} - static int mod_sysfs_setup(struct module *mod, const struct load_info *info, struct kernel_param *kparam, @@ -1521,13 +1516,17 @@ static void mod_sysfs_fini(struct module *mod) { } +static void module_remove_modinfo_attrs(struct module *mod) +{ +} + static void del_usage_links(struct module *mod) { } #endif /* CONFIG_SYSFS */ -static void mod_kobject_remove(struct module *mod) +static void mod_sysfs_teardown(struct module *mod) { del_usage_links(mod); module_remove_modinfo_attrs(mod); @@ -1557,7 +1556,7 @@ static void free_module(struct module *mod) mutex_lock(&module_mutex); stop_machine(__unlink_module, mod, NULL); mutex_unlock(&module_mutex); - mod_kobject_remove(mod); + mod_sysfs_teardown(mod); /* Remove dynamic debug info */ ddebug_remove_module(mod->name); |