Commit ce2ddd6d authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 52c3416d

scripts/Makefile.modpost

+1 −1
Original line number Diff line number Diff line
@@ -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)

scripts/mod/modpost.c

+1 −8
Original line number Diff line number Diff line
@@ -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;