summaryrefslogtreecommitdiff
path: root/scripts/mod
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2020-06-01 08:57:27 +0300
committerMasahiro Yamada <masahiroy@kernel.org>2020-06-06 17:39:20 +0300
commit0b19d54cae11bd5b9e208f52e42d88ad33a3b1d9 (patch)
tree61ab5fc541defa3a5203136624b09adbd2d6407a /scripts/mod
parent5a438af9db2c4a0b80d51d8c1c9c623b0c0de967 (diff)
downloadlinux-0b19d54cae11bd5b9e208f52e42d88ad33a3b1d9.tar.xz
modpost: remove mod->skip struct member
The meaning of 'skip' is obscure since it does not explain "what to skip". mod->skip is set when it is vmlinux or the module info came from a dump file. So, mod->skip is equivalent to (mod->is_vmlinux || mod->from_dump). For the check in write_namespace_deps_files(), mod->is_vmlinux is unneeded because the -d option is not passed in the first pass of modpost. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts/mod')
-rw-r--r--scripts/mod/modpost.c9
-rw-r--r--scripts/mod/modpost.h1
2 files changed, 3 insertions, 7 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 167700a7b80f..925c1a1856aa 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -2012,10 +2012,8 @@ static void read_symbols(const char *modname)
mod = new_module(modname);
- if (mod->is_vmlinux) {
+ if (mod->is_vmlinux)
have_vmlinux = 1;
- mod->skip = 1;
- }
if (!mod->is_vmlinux) {
license = get_modinfo(&info, "license");
@@ -2474,7 +2472,6 @@ static void read_dump(const char *fname)
mod = new_module(modname);
if (mod->is_vmlinux)
have_vmlinux = 1;
- mod->skip = 1;
mod->from_dump = 1;
}
s = sym_add_exported(symname, mod, export_no(export));
@@ -2535,7 +2532,7 @@ static void write_namespace_deps_files(const char *fname)
for (mod = modules; mod; mod = mod->next) {
- if (mod->skip || !mod->missing_namespaces)
+ if (mod->from_dump || !mod->missing_namespaces)
continue;
buf_printf(&ns_deps_buf, "%s.ko:", mod->name);
@@ -2637,7 +2634,7 @@ int main(int argc, char **argv)
for (mod = modules; mod; mod = mod->next) {
char fname[PATH_MAX];
- if (mod->skip)
+ if (mod->is_vmlinux || mod->from_dump)
continue;
buf.pos = 0;
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 87251729539e..3dc9e8fa5d1f 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -122,7 +122,6 @@ struct module {
int from_dump; /* 1 if module was loaded from *.symvers */
int is_vmlinux;
int seen;
- int skip;
int has_init;
int has_cleanup;
struct buffer dev_table_buf;