@@ -538,7 +538,7 @@ static void setup_modinfo_##field(struct module *mod, const char *s) \
538538{ \
539539 mod->field = kstrdup(s, GFP_KERNEL); \
540540} \
541- static ssize_t show_modinfo_##field(struct module_attribute *mattr, \
541+ static ssize_t show_modinfo_##field(const struct module_attribute *mattr, \
542542 struct module_kobject *mk, char *buffer) \
543543{ \
544544 return scnprintf(buffer, PAGE_SIZE, "%s\n", mk->mod->field); \
@@ -552,7 +552,7 @@ static void free_modinfo_##field(struct module *mod) \
552552 kfree(mod->field); \
553553 mod->field = NULL; \
554554} \
555- static struct module_attribute modinfo_##field = { \
555+ static const struct module_attribute modinfo_##field = { \
556556 .attr = { .name = __stringify(field), .mode = 0444 }, \
557557 .show = show_modinfo_##field, \
558558 .setup = setup_modinfo_##field, \
@@ -842,13 +842,13 @@ void symbol_put_addr(void *addr)
842842}
843843EXPORT_SYMBOL_GPL (symbol_put_addr );
844844
845- static ssize_t show_refcnt (struct module_attribute * mattr ,
845+ static ssize_t show_refcnt (const struct module_attribute * mattr ,
846846 struct module_kobject * mk , char * buffer )
847847{
848848 return sprintf (buffer , "%i\n" , module_refcount (mk -> mod ));
849849}
850850
851- static struct module_attribute modinfo_refcnt =
851+ static const struct module_attribute modinfo_refcnt =
852852 __ATTR (refcnt , 0444 , show_refcnt , NULL );
853853
854854void __module_get (struct module * module )
@@ -917,7 +917,7 @@ size_t module_flags_taint(unsigned long taints, char *buf)
917917 return l ;
918918}
919919
920- static ssize_t show_initstate (struct module_attribute * mattr ,
920+ static ssize_t show_initstate (const struct module_attribute * mattr ,
921921 struct module_kobject * mk , char * buffer )
922922{
923923 const char * state = "unknown" ;
@@ -938,10 +938,10 @@ static ssize_t show_initstate(struct module_attribute *mattr,
938938 return sprintf (buffer , "%s\n" , state );
939939}
940940
941- static struct module_attribute modinfo_initstate =
941+ static const struct module_attribute modinfo_initstate =
942942 __ATTR (initstate , 0444 , show_initstate , NULL );
943943
944- static ssize_t store_uevent (struct module_attribute * mattr ,
944+ static ssize_t store_uevent (const struct module_attribute * mattr ,
945945 struct module_kobject * mk ,
946946 const char * buffer , size_t count )
947947{
@@ -951,10 +951,10 @@ static ssize_t store_uevent(struct module_attribute *mattr,
951951 return rc ? rc : count ;
952952}
953953
954- struct module_attribute module_uevent =
954+ const struct module_attribute module_uevent =
955955 __ATTR (uevent , 0200 , NULL , store_uevent );
956956
957- static ssize_t show_coresize (struct module_attribute * mattr ,
957+ static ssize_t show_coresize (const struct module_attribute * mattr ,
958958 struct module_kobject * mk , char * buffer )
959959{
960960 unsigned int size = mk -> mod -> mem [MOD_TEXT ].size ;
@@ -966,11 +966,11 @@ static ssize_t show_coresize(struct module_attribute *mattr,
966966 return sprintf (buffer , "%u\n" , size );
967967}
968968
969- static struct module_attribute modinfo_coresize =
969+ static const struct module_attribute modinfo_coresize =
970970 __ATTR (coresize , 0444 , show_coresize , NULL );
971971
972972#ifdef CONFIG_ARCH_WANTS_MODULES_DATA_IN_VMALLOC
973- static ssize_t show_datasize (struct module_attribute * mattr ,
973+ static ssize_t show_datasize (const struct module_attribute * mattr ,
974974 struct module_kobject * mk , char * buffer )
975975{
976976 unsigned int size = 0 ;
@@ -980,11 +980,11 @@ static ssize_t show_datasize(struct module_attribute *mattr,
980980 return sprintf (buffer , "%u\n" , size );
981981}
982982
983- static struct module_attribute modinfo_datasize =
983+ static const struct module_attribute modinfo_datasize =
984984 __ATTR (datasize , 0444 , show_datasize , NULL );
985985#endif
986986
987- static ssize_t show_initsize (struct module_attribute * mattr ,
987+ static ssize_t show_initsize (const struct module_attribute * mattr ,
988988 struct module_kobject * mk , char * buffer )
989989{
990990 unsigned int size = 0 ;
@@ -994,10 +994,10 @@ static ssize_t show_initsize(struct module_attribute *mattr,
994994 return sprintf (buffer , "%u\n" , size );
995995}
996996
997- static struct module_attribute modinfo_initsize =
997+ static const struct module_attribute modinfo_initsize =
998998 __ATTR (initsize , 0444 , show_initsize , NULL );
999999
1000- static ssize_t show_taint (struct module_attribute * mattr ,
1000+ static ssize_t show_taint (const struct module_attribute * mattr ,
10011001 struct module_kobject * mk , char * buffer )
10021002{
10031003 size_t l ;
@@ -1007,10 +1007,10 @@ static ssize_t show_taint(struct module_attribute *mattr,
10071007 return l ;
10081008}
10091009
1010- static struct module_attribute modinfo_taint =
1010+ static const struct module_attribute modinfo_taint =
10111011 __ATTR (taint , 0444 , show_taint , NULL );
10121012
1013- struct module_attribute * modinfo_attrs [] = {
1013+ const struct module_attribute * const modinfo_attrs [] = {
10141014 & module_uevent ,
10151015 & modinfo_version ,
10161016 & modinfo_srcversion ,
@@ -1027,7 +1027,7 @@ struct module_attribute *modinfo_attrs[] = {
10271027 NULL ,
10281028};
10291029
1030- size_t modinfo_attrs_count = ARRAY_SIZE (modinfo_attrs );
1030+ const size_t modinfo_attrs_count = ARRAY_SIZE (modinfo_attrs );
10311031
10321032static const char vermagic [] = VERMAGIC_STRING ;
10331033
@@ -1681,7 +1681,7 @@ static void module_license_taint_check(struct module *mod, const char *license)
16811681
16821682static void setup_modinfo (struct module * mod , struct load_info * info )
16831683{
1684- struct module_attribute * attr ;
1684+ const struct module_attribute * attr ;
16851685 int i ;
16861686
16871687 for (i = 0 ; (attr = modinfo_attrs [i ]); i ++ ) {
@@ -1692,7 +1692,7 @@ static void setup_modinfo(struct module *mod, struct load_info *info)
16921692
16931693static void free_modinfo (struct module * mod )
16941694{
1695- struct module_attribute * attr ;
1695+ const struct module_attribute * attr ;
16961696 int i ;
16971697
16981698 for (i = 0 ; (attr = modinfo_attrs [i ]); i ++ ) {
0 commit comments