modpost: allow to pass -i option multiple times to remove -e option

Now that there is no difference between -i and -e, they can be unified.

Make modpost accept the -i option multiple times, then remove -e.

I will reuse -e for a different purpose.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 3334f100a4909419ba2e140ab51a1e028ab00a32..7e07adab929c44e9acc5cf2385b0c7090c3dd2fb 100644 (file)
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -50,7 +50,7 @@ MODPOST = scripts/mod/modpost                                                         \
        $(if $(CONFIG_MODVERSIONS),-m)                                                  \
        $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a)                                        \
        $(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile)                                   \
-       $(if $(KBUILD_EXTMOD),$(addprefix -e ,$(KBUILD_EXTRA_SYMBOLS)))                 \
+       $(if $(KBUILD_EXTMOD),$(addprefix -i ,$(KBUILD_EXTRA_SYMBOLS)))                 \
        $(if $(KBUILD_EXTMOD),-o $(modulesymfile))                                      \
        $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)                                  \
        $(if $(KBUILD_MODPOST_WARN),-w)

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 60f35b89cea28040a230a15250f34fb1e4de5430..28d8f5377c621265df680f1c7de551062912143d 100644 (file)
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -2544,7 +2544,6 @@ int main(int argc, char **argv)
 {
        struct module *mod;
        struct buffer buf = { };
-       char *kernel_read = NULL;
        char *missing_namespace_deps = NULL;
        char *dump_write = NULL, *files_source = NULL;
        int opt;
@@ -2553,13 +2552,9 @@ int main(int argc, char **argv)
        struct ext_sym_list *extsym_start = NULL;
        struct ext_sym_list **extsym_iter = &extsym_start;
 
-       while ((opt = getopt(argc, argv, "i:e:mnsT:o:awENd:")) != -1) {
+       while ((opt = getopt(argc, argv, "i:mnsT:o:awENd:")) != -1) {
                switch (opt) {
                case 'i':
-                       kernel_read = optarg;
-                       external_module = 1;
-                       break;
-               case 'e':
                        external_module = 1;
                        *extsym_iter = NOFAIL(calloc(1, sizeof(**extsym_iter)));
                        (*extsym_iter)->file = optarg;
@@ -2600,8 +2595,6 @@ int main(int argc, char **argv)
                }
        }
 
-       if (kernel_read)
-               read_dump(kernel_read);
        while (extsym_start) {
                struct ext_sym_list *tmp;