| Message ID | 20220505072244.1155033-13-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kbuild: yet another series of cleanups (modpost, LTO, MODULE_REL_CRCS) | expand |
On Thu, May 05, 2022 at 04:22:41PM +0900 Masahiro Yamada wrote: > ->is_static is set to true at allocation, then to false if the symbol > comes from the dump file. > > It is simpler to use !mod->from_dump as the init value. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > (no changes since v2) > > Changes in v2: > - New patch > > scripts/mod/modpost.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c > index e07542a90fc6..4edd5b223f49 100644 > --- a/scripts/mod/modpost.c > +++ b/scripts/mod/modpost.c > @@ -242,7 +242,7 @@ static struct symbol *alloc_symbol(const char *name) > > memset(s, 0, sizeof(*s)); > strcpy(s->name, name); > - s->is_static = true; > + > return s; > } > > @@ -376,6 +376,7 @@ static struct symbol *sym_add_exported(const char *name, struct module *mod, > > s = alloc_symbol(name); > s->module = mod; > + s->is_static = !mod->from_dump; > s->is_gpl_only = gpl_only; > list_add_tail(&s->list, &mod->exported_symbols); > hash_add_symbol(s); > @@ -2523,7 +2524,6 @@ static void read_dump(const char *fname) > mod->from_dump = true; > } > s = sym_add_exported(symname, mod, gpl_only); > - s->is_static = false; > sym_set_crc(s, crc); > sym_update_namespace(symname, namespace); > } > -- > 2.32.0 Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index e07542a90fc6..4edd5b223f49 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -242,7 +242,7 @@ static struct symbol *alloc_symbol(const char *name) memset(s, 0, sizeof(*s)); strcpy(s->name, name); - s->is_static = true; + return s; } @@ -376,6 +376,7 @@ static struct symbol *sym_add_exported(const char *name, struct module *mod, s = alloc_symbol(name); s->module = mod; + s->is_static = !mod->from_dump; s->is_gpl_only = gpl_only; list_add_tail(&s->list, &mod->exported_symbols); hash_add_symbol(s); @@ -2523,7 +2524,6 @@ static void read_dump(const char *fname) mod->from_dump = true; } s = sym_add_exported(symname, mod, gpl_only); - s->is_static = false; sym_set_crc(s, crc); sym_update_namespace(symname, namespace); }
->is_static is set to true at allocation, then to false if the symbol comes from the dump file. It is simpler to use !mod->from_dump as the init value. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- (no changes since v2) Changes in v2: - New patch scripts/mod/modpost.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)