openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

modpost: remove mod->is_dot_o struct member 

Previously, there were two cases where mod->is_dot_o is unset:

[1] the executable 'vmlinux' in the second pass of modpost
[2] modules loaded by read_dump()

I think [1] was intended usage to distinguish 'vmlinux.o' and 'vmlinux'.
Now that modpost does not parse the executable 'vmlinux', this case
does not happen.

[2] is obscure, maybe a bug. Module.symver stores module paths without
extension. So, none of modules loaded by read_dump() has the .o suffix,
and new_module() unsets ->is_dot_o. Anyway, it is not a big deal because
handle_symbol() is not called for the case.

To sum up, all the parsed ELF files are .o files.

mod->is_dot_o is unneeded.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2020-06-01 14:57:24 +09:00
parent 859c926aea
commit 3379576dd6
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/mod/modpost.c
View File

@ -182,10 +182,8 @@ static struct module *new_module(const char *modname)
p = NOFAIL(strdup(modname)); p = NOFAIL(strdup(modname));
/* strip trailing .o */ /* strip trailing .o */
if (strends(p, ".o")) { if (strends(p, ".o"))
p[strlen(p) - 2] = '\0'; p[strlen(p) - 2] = '\0';
mod->is_dot_o = 1;
}
/* add to list */ /* add to list */
mod->name = p; mod->name = p;
@ -716,8 +714,7 @@ static void handle_symbol(struct module *mod, struct elf_info *info,
enum export export; enum export export;
const char *name; const char *name;
if ((!is_vmlinux(mod->name) || mod->is_dot_o) && if (strstarts(symname, "__ksymtab"))
strstarts(symname, "__ksymtab"))
export = export_from_secname(info, get_secindex(info, sym)); export = export_from_secname(info, get_secindex(info, sym));
else else
export = export_from_sec(info, get_secindex(info, sym)); export = export_from_sec(info, get_secindex(info, sym));
@ -2676,13 +2673,6 @@ int main(int argc, char **argv)
struct symbol *s; struct symbol *s;
for (s = symbolhash[n]; s; s = s->next) { for (s = symbolhash[n]; s; s = s->next) {
/*
* Do not check "vmlinux". This avoids the same warnings
* shown twice, and false-positives for ARCH=um.
*/
if (is_vmlinux(s->module->name) && !s->module->is_dot_o)
continue;
if (s->is_static) if (s->is_static)
warn("\"%s\" [%s] is a static %s\n", warn("\"%s\" [%s] is a static %s\n",
s->name, s->module->name, s->name, s->module->name,

1
scripts/mod/modpost.h
View File

@ -126,7 +126,6 @@ struct module {
int has_cleanup; int has_cleanup;
struct buffer dev_table_buf; struct buffer dev_table_buf;
char srcversion[25]; char srcversion[25];
int is_dot_o;
// Missing namespace dependencies // Missing namespace dependencies
struct namespace_list *missing_namespaces; struct namespace_list *missing_namespaces;
// Actual imported namespaces // Actual imported namespaces