Skip to content

Commit bbd3f4f

Browse files
author
Uwe Kleine-König
committed
modpost: give most mismatch constants a better name
Signed-off-by: Uwe Kleine-König <[email protected]>
1 parent 4a31a22 commit bbd3f4f

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

scripts/mod/modpost.c

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -836,14 +836,14 @@ static const char *linker_symbols[] =
836836

837837
enum mismatch {
838838
NO_MISMATCH,
839-
TEXT_TO_INIT,
840-
DATA_TO_INIT,
841-
TEXT_TO_EXIT,
842-
DATA_TO_EXIT,
843-
XXXINIT_TO_INIT,
844-
XXXEXIT_TO_EXIT,
845-
INIT_TO_EXIT,
846-
EXIT_TO_INIT,
839+
TEXT_TO_ANY_INIT,
840+
DATA_TO_ANY_INIT,
841+
TEXT_TO_ANY_EXIT,
842+
DATA_TO_ANY_EXIT,
843+
XXXINIT_TO_SOME_INIT,
844+
XXXEXIT_TO_SOME_EXIT,
845+
ANY_INIT_TO_ANY_EXIT,
846+
ANY_EXIT_TO_ANY_INIT,
847847
EXPORT_TO_INIT_EXIT,
848848
};
849849

@@ -860,70 +860,70 @@ const struct sectioncheck sectioncheck[] = {
860860
{
861861
.fromsec = { TEXT_SECTIONS, NULL },
862862
.tosec = { ALL_INIT_SECTIONS, NULL },
863-
.mismatch = TEXT_TO_INIT,
863+
.mismatch = TEXT_TO_ANY_INIT,
864864
},
865865
{
866866
.fromsec = { DATA_SECTIONS, NULL },
867867
.tosec = { ALL_INIT_SECTIONS, NULL },
868-
.mismatch = DATA_TO_INIT,
868+
.mismatch = DATA_TO_ANY_INIT,
869869
},
870870
{
871871
.fromsec = { TEXT_SECTIONS, NULL },
872872
.tosec = { ALL_EXIT_SECTIONS, NULL },
873-
.mismatch = TEXT_TO_EXIT,
873+
.mismatch = TEXT_TO_ANY_EXIT,
874874
},
875875
{
876876
.fromsec = { DATA_SECTIONS, NULL },
877877
.tosec = { ALL_EXIT_SECTIONS, NULL },
878-
.mismatch = DATA_TO_EXIT,
878+
.mismatch = DATA_TO_ANY_EXIT,
879879
},
880880
/* Do not reference init code/data from devinit/cpuinit/meminit code/data */
881881
{
882882
.fromsec = { ALL_XXXINIT_SECTIONS, NULL },
883883
.tosec = { INIT_SECTIONS, NULL },
884-
.mismatch = XXXINIT_TO_INIT,
884+
.mismatch = XXXINIT_TO_SOME_INIT,
885885
},
886886
/* Do not reference cpuinit code/data from meminit code/data */
887887
{
888888
.fromsec = { MEM_INIT_SECTIONS, NULL },
889889
.tosec = { CPU_INIT_SECTIONS, NULL },
890-
.mismatch = XXXINIT_TO_INIT,
890+
.mismatch = XXXINIT_TO_SOME_INIT,
891891
},
892892
/* Do not reference meminit code/data from cpuinit code/data */
893893
{
894894
.fromsec = { CPU_INIT_SECTIONS, NULL },
895895
.tosec = { MEM_INIT_SECTIONS, NULL },
896-
.mismatch = XXXINIT_TO_INIT,
896+
.mismatch = XXXINIT_TO_SOME_INIT,
897897
},
898898
/* Do not reference exit code/data from devexit/cpuexit/memexit code/data */
899899
{
900900
.fromsec = { ALL_XXXEXIT_SECTIONS, NULL },
901901
.tosec = { EXIT_SECTIONS, NULL },
902-
.mismatch = XXXEXIT_TO_EXIT,
902+
.mismatch = XXXEXIT_TO_SOME_EXIT,
903903
},
904904
/* Do not reference cpuexit code/data from memexit code/data */
905905
{
906906
.fromsec = { MEM_EXIT_SECTIONS, NULL },
907907
.tosec = { CPU_EXIT_SECTIONS, NULL },
908-
.mismatch = XXXEXIT_TO_EXIT,
908+
.mismatch = XXXEXIT_TO_SOME_EXIT,
909909
},
910910
/* Do not reference memexit code/data from cpuexit code/data */
911911
{
912912
.fromsec = { CPU_EXIT_SECTIONS, NULL },
913913
.tosec = { MEM_EXIT_SECTIONS, NULL },
914-
.mismatch = XXXEXIT_TO_EXIT,
914+
.mismatch = XXXEXIT_TO_SOME_EXIT,
915915
},
916916
/* Do not use exit code/data from init code */
917917
{
918918
.fromsec = { ALL_INIT_SECTIONS, NULL },
919919
.tosec = { ALL_EXIT_SECTIONS, NULL },
920-
.mismatch = INIT_TO_EXIT,
920+
.mismatch = ANY_INIT_TO_ANY_EXIT,
921921
},
922922
/* Do not use init code/data from exit code */
923923
{
924924
.fromsec = { ALL_EXIT_SECTIONS, NULL },
925925
.tosec = { ALL_INIT_SECTIONS, NULL },
926-
.mismatch = EXIT_TO_INIT,
926+
.mismatch = ANY_EXIT_TO_ANY_INIT,
927927
},
928928
/* Do not export init/exit functions or data */
929929
{
@@ -1190,7 +1190,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
11901190
tosym, to_p);
11911191

11921192
switch (mismatch) {
1193-
case TEXT_TO_INIT:
1193+
case TEXT_TO_ANY_INIT:
11941194
fprintf(stderr,
11951195
"The function %s%s() references\n"
11961196
"the %s %s%s%s.\n"
@@ -1200,7 +1200,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
12001200
to, sec2annotation(tosec), tosym, to_p,
12011201
fromsym, sec2annotation(tosec), tosym);
12021202
break;
1203-
case DATA_TO_INIT: {
1203+
case DATA_TO_ANY_INIT: {
12041204
const char **s = symbol_white_list;
12051205
fprintf(stderr,
12061206
"The variable %s references\n"
@@ -1214,14 +1214,14 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
12141214
fprintf(stderr, "\n");
12151215
break;
12161216
}
1217-
case TEXT_TO_EXIT:
1217+
case TEXT_TO_ANY_EXIT:
12181218
fprintf(stderr,
12191219
"The function %s() references a %s in an exit section.\n"
12201220
"Often the %s %s%s has valid usage outside the exit section\n"
12211221
"and the fix is to remove the %sannotation of %s.\n",
12221222
fromsym, to, to, tosym, to_p, sec2annotation(tosec), tosym);
12231223
break;
1224-
case DATA_TO_EXIT: {
1224+
case DATA_TO_ANY_EXIT: {
12251225
const char **s = symbol_white_list;
12261226
fprintf(stderr,
12271227
"The variable %s references\n"
@@ -1235,8 +1235,8 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
12351235
fprintf(stderr, "\n");
12361236
break;
12371237
}
1238-
case XXXINIT_TO_INIT:
1239-
case XXXEXIT_TO_EXIT:
1238+
case XXXINIT_TO_SOME_INIT:
1239+
case XXXEXIT_TO_SOME_EXIT:
12401240
fprintf(stderr,
12411241
"The %s %s%s%s references\n"
12421242
"a %s %s%s%s.\n"
@@ -1246,7 +1246,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
12461246
to, sec2annotation(tosec), tosym, to_p,
12471247
tosym, fromsym, tosym);
12481248
break;
1249-
case INIT_TO_EXIT:
1249+
case ANY_INIT_TO_ANY_EXIT:
12501250
fprintf(stderr,
12511251
"The %s %s%s%s references\n"
12521252
"a %s %s%s%s.\n"
@@ -1259,7 +1259,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
12591259
to, sec2annotation(tosec), tosym, to_p,
12601260
sec2annotation(tosec), tosym, to_p);
12611261
break;
1262-
case EXIT_TO_INIT:
1262+
case ANY_EXIT_TO_ANY_INIT:
12631263
fprintf(stderr,
12641264
"The %s %s%s%s references\n"
12651265
"a %s %s%s%s.\n"

0 commit comments

Comments
 (0)