The -i option is used to include Modules.symver as well as files from
$(KBUILD_EXTRA_SYMBOLS).

Make the struct and variable names more generic.

Signed-off-by: Masahiro Yamada <[email protected]>
---

Changes in v2: None

 scripts/mod/modpost.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 2ecf72a176cf..ebfc720ee5a4 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -2549,8 +2549,8 @@ static void write_namespace_deps_files(const char *fname)
        free(ns_deps_buf.p);
 }
 
-struct ext_sym_list {
-       struct ext_sym_list *next;
+struct dump_list {
+       struct dump_list *next;
        const char *file;
 };
 
@@ -2563,16 +2563,17 @@ int main(int argc, char **argv)
        int opt;
        int err;
        int n;
-       struct ext_sym_list *extsym_start = NULL;
-       struct ext_sym_list **extsym_iter = &extsym_start;
+       struct dump_list *dump_read_start = NULL;
+       struct dump_list **dump_read_iter = &dump_read_start;
 
        while ((opt = getopt(argc, argv, "i:mnsT:o:awENd:")) != -1) {
                switch (opt) {
                case 'i':
                        external_module = 1;
-                       *extsym_iter = NOFAIL(calloc(1, sizeof(**extsym_iter)));
-                       (*extsym_iter)->file = optarg;
-                       extsym_iter = &(*extsym_iter)->next;
+                       *dump_read_iter =
+                               NOFAIL(calloc(1, sizeof(**dump_read_iter)));
+                       (*dump_read_iter)->file = optarg;
+                       dump_read_iter = &(*dump_read_iter)->next;
                        break;
                case 'm':
                        modversions = 1;
@@ -2609,13 +2610,13 @@ int main(int argc, char **argv)
                }
        }
 
-       while (extsym_start) {
-               struct ext_sym_list *tmp;
+       while (dump_read_start) {
+               struct dump_list *tmp;
 
-               read_dump(extsym_start->file);
-               tmp = extsym_start->next;
-               free(extsym_start);
-               extsym_start = tmp;
+               read_dump(dump_read_start->file);
+               tmp = dump_read_start->next;
+               free(dump_read_start);
+               dump_read_start = tmp;
        }
 
        while (optind < argc)
-- 
2.25.1

Reply via email to