@@ -82,7 +82,7 @@ include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
# modpost options for external modules
MODPOST += \
-i Module.symvers \
- $(addprefix -e ,$(KBUILD_EXTRA_SYMBOLS)) \
+ $(addprefix -i ,$(KBUILD_EXTRA_SYMBOLS)) \
-o $(KBUILD_EXTMOD)/Module.symvers
endif
@@ -2558,7 +2558,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;
@@ -2567,13 +2566,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;
@@ -2614,8 +2609,6 @@ int main(int argc, char **argv)
}
}
- if (kernel_read)
- read_dump(kernel_read);
while (extsym_start) {
struct ext_sym_list *tmp;
Now that there is no difference in the functionality of -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> --- Changes in v2: None scripts/Makefile.modpost | 2 +- scripts/mod/modpost.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-)