diff options
-rw-r--r-- | include/linux/module.h | 1 | ||||
-rw-r--r-- | kernel/module.c | 17 | ||||
-rw-r--r-- | kernel/params.c | 4 |
3 files changed, 22 insertions, 0 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index b87e7625a98c..1c30087a2d81 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
@@ -75,6 +75,7 @@ struct module_version_attribute { | |||
75 | extern ssize_t __modver_version_show(struct module_attribute *, | 75 | extern ssize_t __modver_version_show(struct module_attribute *, |
76 | struct module_kobject *, char *); | 76 | struct module_kobject *, char *); |
77 | 77 | ||
78 | extern struct module_attribute module_uevent; | ||
78 | 79 | ||
79 | /* These are either module local, or the kernel's dummy ones. */ | 80 | /* These are either module local, or the kernel's dummy ones. */ |
80 | extern int init_module(void); | 81 | extern int init_module(void); |
diff --git a/kernel/module.c b/kernel/module.c index a4295e67dd83..04379f92f843 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -975,10 +975,27 @@ static struct module_attribute initstate = { | |||
975 | .show = show_initstate, | 975 | .show = show_initstate, |
976 | }; | 976 | }; |
977 | 977 | ||
978 | static ssize_t store_uevent(struct module_attribute *mattr, | ||
979 | struct module_kobject *mk, | ||
980 | const char *buffer, size_t count) | ||
981 | { | ||
982 | enum kobject_action action; | ||
983 | |||
984 | if (kobject_action_type(buffer, count, &action) == 0) | ||
985 | kobject_uevent(&mk->kobj, action); | ||
986 | return count; | ||
987 | } | ||
988 | |||
989 | struct module_attribute module_uevent = { | ||
990 | .attr = { .name = "uevent", .mode = 0200 }, | ||
991 | .store = store_uevent, | ||
992 | }; | ||
993 | |||
978 | static struct module_attribute *modinfo_attrs[] = { | 994 | static struct module_attribute *modinfo_attrs[] = { |
979 | &modinfo_version, | 995 | &modinfo_version, |
980 | &modinfo_srcversion, | 996 | &modinfo_srcversion, |
981 | &initstate, | 997 | &initstate, |
998 | &module_uevent, | ||
982 | #ifdef CONFIG_MODULE_UNLOAD | 999 | #ifdef CONFIG_MODULE_UNLOAD |
983 | &refcnt, | 1000 | &refcnt, |
984 | #endif | 1001 | #endif |
diff --git a/kernel/params.c b/kernel/params.c index 37e9b20a718b..22df3e0d142a 100644 --- a/kernel/params.c +++ b/kernel/params.c | |||
@@ -730,6 +730,10 @@ static struct module_kobject * __init locate_module_kobject(const char *name) | |||
730 | mk->kobj.kset = module_kset; | 730 | mk->kobj.kset = module_kset; |
731 | err = kobject_init_and_add(&mk->kobj, &module_ktype, NULL, | 731 | err = kobject_init_and_add(&mk->kobj, &module_ktype, NULL, |
732 | "%s", name); | 732 | "%s", name); |
733 | #ifdef CONFIG_MODULES | ||
734 | if (!err) | ||
735 | err = sysfs_create_file(&mk->kobj, &module_uevent.attr); | ||
736 | #endif | ||
733 | if (err) { | 737 | if (err) { |
734 | kobject_put(&mk->kobj); | 738 | kobject_put(&mk->kobj); |
735 | printk(KERN_ERR | 739 | printk(KERN_ERR |