Commit bbd3f4fb authored by Uwe Kleine-König's avatar Uwe Kleine-König

modpost: give most mismatch constants a better name

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 4a31a229
...@@ -836,14 +836,14 @@ static const char *linker_symbols[] = ...@@ -836,14 +836,14 @@ static const char *linker_symbols[] =
enum mismatch { enum mismatch {
NO_MISMATCH, NO_MISMATCH,
TEXT_TO_INIT, TEXT_TO_ANY_INIT,
DATA_TO_INIT, DATA_TO_ANY_INIT,
TEXT_TO_EXIT, TEXT_TO_ANY_EXIT,
DATA_TO_EXIT, DATA_TO_ANY_EXIT,
XXXINIT_TO_INIT, XXXINIT_TO_SOME_INIT,
XXXEXIT_TO_EXIT, XXXEXIT_TO_SOME_EXIT,
INIT_TO_EXIT, ANY_INIT_TO_ANY_EXIT,
EXIT_TO_INIT, ANY_EXIT_TO_ANY_INIT,
EXPORT_TO_INIT_EXIT, EXPORT_TO_INIT_EXIT,
}; };
...@@ -860,70 +860,70 @@ const struct sectioncheck sectioncheck[] = { ...@@ -860,70 +860,70 @@ const struct sectioncheck sectioncheck[] = {
{ {
.fromsec = { TEXT_SECTIONS, NULL }, .fromsec = { TEXT_SECTIONS, NULL },
.tosec = { ALL_INIT_SECTIONS, NULL }, .tosec = { ALL_INIT_SECTIONS, NULL },
.mismatch = TEXT_TO_INIT, .mismatch = TEXT_TO_ANY_INIT,
}, },
{ {
.fromsec = { DATA_SECTIONS, NULL }, .fromsec = { DATA_SECTIONS, NULL },
.tosec = { ALL_INIT_SECTIONS, NULL }, .tosec = { ALL_INIT_SECTIONS, NULL },
.mismatch = DATA_TO_INIT, .mismatch = DATA_TO_ANY_INIT,
}, },
{ {
.fromsec = { TEXT_SECTIONS, NULL }, .fromsec = { TEXT_SECTIONS, NULL },
.tosec = { ALL_EXIT_SECTIONS, NULL }, .tosec = { ALL_EXIT_SECTIONS, NULL },
.mismatch = TEXT_TO_EXIT, .mismatch = TEXT_TO_ANY_EXIT,
}, },
{ {
.fromsec = { DATA_SECTIONS, NULL }, .fromsec = { DATA_SECTIONS, NULL },
.tosec = { ALL_EXIT_SECTIONS, NULL }, .tosec = { ALL_EXIT_SECTIONS, NULL },
.mismatch = DATA_TO_EXIT, .mismatch = DATA_TO_ANY_EXIT,
}, },
/* Do not reference init code/data from devinit/cpuinit/meminit code/data */ /* Do not reference init code/data from devinit/cpuinit/meminit code/data */
{ {
.fromsec = { ALL_XXXINIT_SECTIONS, NULL }, .fromsec = { ALL_XXXINIT_SECTIONS, NULL },
.tosec = { INIT_SECTIONS, NULL }, .tosec = { INIT_SECTIONS, NULL },
.mismatch = XXXINIT_TO_INIT, .mismatch = XXXINIT_TO_SOME_INIT,
}, },
/* Do not reference cpuinit code/data from meminit code/data */ /* Do not reference cpuinit code/data from meminit code/data */
{ {
.fromsec = { MEM_INIT_SECTIONS, NULL }, .fromsec = { MEM_INIT_SECTIONS, NULL },
.tosec = { CPU_INIT_SECTIONS, NULL }, .tosec = { CPU_INIT_SECTIONS, NULL },
.mismatch = XXXINIT_TO_INIT, .mismatch = XXXINIT_TO_SOME_INIT,
}, },
/* Do not reference meminit code/data from cpuinit code/data */ /* Do not reference meminit code/data from cpuinit code/data */
{ {
.fromsec = { CPU_INIT_SECTIONS, NULL }, .fromsec = { CPU_INIT_SECTIONS, NULL },
.tosec = { MEM_INIT_SECTIONS, NULL }, .tosec = { MEM_INIT_SECTIONS, NULL },
.mismatch = XXXINIT_TO_INIT, .mismatch = XXXINIT_TO_SOME_INIT,
}, },
/* Do not reference exit code/data from devexit/cpuexit/memexit code/data */ /* Do not reference exit code/data from devexit/cpuexit/memexit code/data */
{ {
.fromsec = { ALL_XXXEXIT_SECTIONS, NULL }, .fromsec = { ALL_XXXEXIT_SECTIONS, NULL },
.tosec = { EXIT_SECTIONS, NULL }, .tosec = { EXIT_SECTIONS, NULL },
.mismatch = XXXEXIT_TO_EXIT, .mismatch = XXXEXIT_TO_SOME_EXIT,
}, },
/* Do not reference cpuexit code/data from memexit code/data */ /* Do not reference cpuexit code/data from memexit code/data */
{ {
.fromsec = { MEM_EXIT_SECTIONS, NULL }, .fromsec = { MEM_EXIT_SECTIONS, NULL },
.tosec = { CPU_EXIT_SECTIONS, NULL }, .tosec = { CPU_EXIT_SECTIONS, NULL },
.mismatch = XXXEXIT_TO_EXIT, .mismatch = XXXEXIT_TO_SOME_EXIT,
}, },
/* Do not reference memexit code/data from cpuexit code/data */ /* Do not reference memexit code/data from cpuexit code/data */
{ {
.fromsec = { CPU_EXIT_SECTIONS, NULL }, .fromsec = { CPU_EXIT_SECTIONS, NULL },
.tosec = { MEM_EXIT_SECTIONS, NULL }, .tosec = { MEM_EXIT_SECTIONS, NULL },
.mismatch = XXXEXIT_TO_EXIT, .mismatch = XXXEXIT_TO_SOME_EXIT,
}, },
/* Do not use exit code/data from init code */ /* Do not use exit code/data from init code */
{ {
.fromsec = { ALL_INIT_SECTIONS, NULL }, .fromsec = { ALL_INIT_SECTIONS, NULL },
.tosec = { ALL_EXIT_SECTIONS, NULL }, .tosec = { ALL_EXIT_SECTIONS, NULL },
.mismatch = INIT_TO_EXIT, .mismatch = ANY_INIT_TO_ANY_EXIT,
}, },
/* Do not use init code/data from exit code */ /* Do not use init code/data from exit code */
{ {
.fromsec = { ALL_EXIT_SECTIONS, NULL }, .fromsec = { ALL_EXIT_SECTIONS, NULL },
.tosec = { ALL_INIT_SECTIONS, NULL }, .tosec = { ALL_INIT_SECTIONS, NULL },
.mismatch = EXIT_TO_INIT, .mismatch = ANY_EXIT_TO_ANY_INIT,
}, },
/* Do not export init/exit functions or data */ /* Do not export init/exit functions or data */
{ {
...@@ -1190,7 +1190,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, ...@@ -1190,7 +1190,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
tosym, to_p); tosym, to_p);
switch (mismatch) { switch (mismatch) {
case TEXT_TO_INIT: case TEXT_TO_ANY_INIT:
fprintf(stderr, fprintf(stderr,
"The function %s%s() references\n" "The function %s%s() references\n"
"the %s %s%s%s.\n" "the %s %s%s%s.\n"
...@@ -1200,7 +1200,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, ...@@ -1200,7 +1200,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
to, sec2annotation(tosec), tosym, to_p, to, sec2annotation(tosec), tosym, to_p,
fromsym, sec2annotation(tosec), tosym); fromsym, sec2annotation(tosec), tosym);
break; break;
case DATA_TO_INIT: { case DATA_TO_ANY_INIT: {
const char **s = symbol_white_list; const char **s = symbol_white_list;
fprintf(stderr, fprintf(stderr,
"The variable %s references\n" "The variable %s references\n"
...@@ -1214,14 +1214,14 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, ...@@ -1214,14 +1214,14 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
fprintf(stderr, "\n"); fprintf(stderr, "\n");
break; break;
} }
case TEXT_TO_EXIT: case TEXT_TO_ANY_EXIT:
fprintf(stderr, fprintf(stderr,
"The function %s() references a %s in an exit section.\n" "The function %s() references a %s in an exit section.\n"
"Often the %s %s%s has valid usage outside the exit section\n" "Often the %s %s%s has valid usage outside the exit section\n"
"and the fix is to remove the %sannotation of %s.\n", "and the fix is to remove the %sannotation of %s.\n",
fromsym, to, to, tosym, to_p, sec2annotation(tosec), tosym); fromsym, to, to, tosym, to_p, sec2annotation(tosec), tosym);
break; break;
case DATA_TO_EXIT: { case DATA_TO_ANY_EXIT: {
const char **s = symbol_white_list; const char **s = symbol_white_list;
fprintf(stderr, fprintf(stderr,
"The variable %s references\n" "The variable %s references\n"
...@@ -1235,8 +1235,8 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, ...@@ -1235,8 +1235,8 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
fprintf(stderr, "\n"); fprintf(stderr, "\n");
break; break;
} }
case XXXINIT_TO_INIT: case XXXINIT_TO_SOME_INIT:
case XXXEXIT_TO_EXIT: case XXXEXIT_TO_SOME_EXIT:
fprintf(stderr, fprintf(stderr,
"The %s %s%s%s references\n" "The %s %s%s%s references\n"
"a %s %s%s%s.\n" "a %s %s%s%s.\n"
...@@ -1246,7 +1246,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, ...@@ -1246,7 +1246,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
to, sec2annotation(tosec), tosym, to_p, to, sec2annotation(tosec), tosym, to_p,
tosym, fromsym, tosym); tosym, fromsym, tosym);
break; break;
case INIT_TO_EXIT: case ANY_INIT_TO_ANY_EXIT:
fprintf(stderr, fprintf(stderr,
"The %s %s%s%s references\n" "The %s %s%s%s references\n"
"a %s %s%s%s.\n" "a %s %s%s%s.\n"
...@@ -1259,7 +1259,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, ...@@ -1259,7 +1259,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
to, sec2annotation(tosec), tosym, to_p, to, sec2annotation(tosec), tosym, to_p,
sec2annotation(tosec), tosym, to_p); sec2annotation(tosec), tosym, to_p);
break; break;
case EXIT_TO_INIT: case ANY_EXIT_TO_ANY_INIT:
fprintf(stderr, fprintf(stderr,
"The %s %s%s%s references\n" "The %s %s%s%s references\n"
"a %s %s%s%s.\n" "a %s %s%s%s.\n"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment