| Message ID | 20220501084032.1025918-11-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kbuild: yet another series of cleanups (modpost and LTO) | expand |
On Sun, May 1, 2022 at 1:42 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > Now that struct module has a list of symbols it exports, this check > can go into check_exports(). The code becomes shorter. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Thanks for the patch! Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > --- > > (no changes since v1) > > scripts/mod/modpost.c | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c > index cd49ef7b5953..4ce8d164b8e0 100644 > --- a/scripts/mod/modpost.c > +++ b/scripts/mod/modpost.c > @@ -2199,6 +2199,12 @@ static void check_exports(struct module *mod) > if (!mod->is_gpl_compatible) > check_for_gpl_usage(exp->export, basename, exp->name); > } > + > + list_for_each_entry(s, &mod->exported_symbols, list) { > + if (s->is_static) > + error("\"%s\" [%s] is a static %s\n", > + s->name, mod->name, export_str(s->export)); > + } > } > > static void check_modname_len(struct module *mod) > @@ -2510,7 +2516,6 @@ int main(int argc, char **argv) > char *missing_namespace_deps = NULL; > char *dump_write = NULL, *files_source = NULL; > int opt; > - int n; > LIST_HEAD(dump_lists); > struct dump_list *dl, *dl2; > > @@ -2606,16 +2611,6 @@ int main(int argc, char **argv) > if (sec_mismatch_count && !sec_mismatch_warn_only) > error("Section mismatches detected.\n" > "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n"); > - for (n = 0; n < SYMBOL_HASH_SIZE; n++) { > - struct symbol *s; > - > - for (s = symbolhash[n]; s; s = s->next) { > - if (s->is_static) > - error("\"%s\" [%s] is a static %s\n", > - s->name, s->module->name, > - export_str(s->export)); > - } > - } > > if (nr_unresolved > MAX_UNRESOLVED_REPORTS) > warn("suppressed %u unresolved symbol warnings because there were too many)\n", > -- > 2.32.0 >
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index cd49ef7b5953..4ce8d164b8e0 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -2199,6 +2199,12 @@ static void check_exports(struct module *mod) if (!mod->is_gpl_compatible) check_for_gpl_usage(exp->export, basename, exp->name); } + + list_for_each_entry(s, &mod->exported_symbols, list) { + if (s->is_static) + error("\"%s\" [%s] is a static %s\n", + s->name, mod->name, export_str(s->export)); + } } static void check_modname_len(struct module *mod) @@ -2510,7 +2516,6 @@ int main(int argc, char **argv) char *missing_namespace_deps = NULL; char *dump_write = NULL, *files_source = NULL; int opt; - int n; LIST_HEAD(dump_lists); struct dump_list *dl, *dl2; @@ -2606,16 +2611,6 @@ int main(int argc, char **argv) if (sec_mismatch_count && !sec_mismatch_warn_only) error("Section mismatches detected.\n" "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n"); - for (n = 0; n < SYMBOL_HASH_SIZE; n++) { - struct symbol *s; - - for (s = symbolhash[n]; s; s = s->next) { - if (s->is_static) - error("\"%s\" [%s] is a static %s\n", - s->name, s->module->name, - export_str(s->export)); - } - } if (nr_unresolved > MAX_UNRESOLVED_REPORTS) warn("suppressed %u unresolved symbol warnings because there were too many)\n",
Now that struct module has a list of symbols it exports, this check can go into check_exports(). The code becomes shorter. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- (no changes since v1) scripts/mod/modpost.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)