diff options
Diffstat (limited to 'kernel/module.c')
-rw-r--r-- | kernel/module.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/module.c b/kernel/module.c index 6301d6e173ca..a4295e67dd83 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -545,9 +545,9 @@ static void setup_modinfo_##field(struct module *mod, const char *s) \ | |||
545 | mod->field = kstrdup(s, GFP_KERNEL); \ | 545 | mod->field = kstrdup(s, GFP_KERNEL); \ |
546 | } \ | 546 | } \ |
547 | static ssize_t show_modinfo_##field(struct module_attribute *mattr, \ | 547 | static ssize_t show_modinfo_##field(struct module_attribute *mattr, \ |
548 | struct module *mod, char *buffer) \ | 548 | struct module_kobject *mk, char *buffer) \ |
549 | { \ | 549 | { \ |
550 | return sprintf(buffer, "%s\n", mod->field); \ | 550 | return sprintf(buffer, "%s\n", mk->mod->field); \ |
551 | } \ | 551 | } \ |
552 | static int modinfo_##field##_exists(struct module *mod) \ | 552 | static int modinfo_##field##_exists(struct module *mod) \ |
553 | { \ | 553 | { \ |
@@ -902,9 +902,9 @@ void symbol_put_addr(void *addr) | |||
902 | EXPORT_SYMBOL_GPL(symbol_put_addr); | 902 | EXPORT_SYMBOL_GPL(symbol_put_addr); |
903 | 903 | ||
904 | static ssize_t show_refcnt(struct module_attribute *mattr, | 904 | static ssize_t show_refcnt(struct module_attribute *mattr, |
905 | struct module *mod, char *buffer) | 905 | struct module_kobject *mk, char *buffer) |
906 | { | 906 | { |
907 | return sprintf(buffer, "%u\n", module_refcount(mod)); | 907 | return sprintf(buffer, "%u\n", module_refcount(mk->mod)); |
908 | } | 908 | } |
909 | 909 | ||
910 | static struct module_attribute refcnt = { | 910 | static struct module_attribute refcnt = { |
@@ -952,11 +952,11 @@ static inline int module_unload_init(struct module *mod) | |||
952 | #endif /* CONFIG_MODULE_UNLOAD */ | 952 | #endif /* CONFIG_MODULE_UNLOAD */ |
953 | 953 | ||
954 | static ssize_t show_initstate(struct module_attribute *mattr, | 954 | static ssize_t show_initstate(struct module_attribute *mattr, |
955 | struct module *mod, char *buffer) | 955 | struct module_kobject *mk, char *buffer) |
956 | { | 956 | { |
957 | const char *state = "unknown"; | 957 | const char *state = "unknown"; |
958 | 958 | ||
959 | switch (mod->state) { | 959 | switch (mk->mod->state) { |
960 | case MODULE_STATE_LIVE: | 960 | case MODULE_STATE_LIVE: |
961 | state = "live"; | 961 | state = "live"; |
962 | break; | 962 | break; |
@@ -1187,7 +1187,7 @@ struct module_sect_attrs | |||
1187 | }; | 1187 | }; |
1188 | 1188 | ||
1189 | static ssize_t module_sect_show(struct module_attribute *mattr, | 1189 | static ssize_t module_sect_show(struct module_attribute *mattr, |
1190 | struct module *mod, char *buf) | 1190 | struct module_kobject *mk, char *buf) |
1191 | { | 1191 | { |
1192 | struct module_sect_attr *sattr = | 1192 | struct module_sect_attr *sattr = |
1193 | container_of(mattr, struct module_sect_attr, mattr); | 1193 | container_of(mattr, struct module_sect_attr, mattr); |