Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46c7dd56 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

modpost: always show verbose warning for section mismatch 



Unless CONFIG_DEBUG_SECTION_MISMATCH is enabled, modpost only shows
the number of section mismatches.

If you want to know the symbols causing the issue, you need to rebuild
with CONFIG_DEBUG_SECTION_MISMATCH. It is tedious.

I think it is fine to show annoying warning when a new section mismatch
comes in.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 393492b5

scripts/Makefile.modpost

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ modpost = scripts/mod/modpost \ 
 $(if $(KBUILD_EXTMOD),-I $(modulesymfile))      \

 $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \

 $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \

 $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \

 $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)  \

 $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)

scripts/mod/modpost.c

+5 −22
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ static int vmlinux_section_warnings = 1; 
static int warn_unresolved = 0;

/* How a symbol is exported */

static int sec_mismatch_count = 0;

static int sec_mismatch_verbose = 1;

static int sec_mismatch_fatal = 0;

/* ignore missing files */

static int ignore_missing_files;
@@ -1406,8 +1405,6 @@ static void report_sec_mismatch(const char *modname, 
	char *prl_to;



	sec_mismatch_count++;

	if (!sec_mismatch_verbose)

		return;



	get_pretty_name(from_is_func, &from, &from_p);

	get_pretty_name(to_is_func, &to, &to_p);
@@ -1655,9 +1652,7 @@ static void extable_mismatch_handler(const char* modname, struct elf_info *elf, 


	sec_mismatch_count++;



	if (sec_mismatch_verbose)

		report_extable_warnings(modname, elf, mismatch, r, sym,

					fromsec, tosec);

	report_extable_warnings(modname, elf, mismatch, r, sym, fromsec, tosec);



	if (match(tosec, mismatch->bad_tosec))

		fatal("The relocation at %s+0x%lx references\n"
@@ -2433,7 +2428,7 @@ int main(int argc, char **argv) 
	struct ext_sym_list *extsym_iter;

	struct ext_sym_list *extsym_start = NULL;



	while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awE")) != -1) {

	while ((opt = getopt(argc, argv, "i:I:e:mnsT:o:awE")) != -1) {

		switch (opt) {

		case 'i':

			kernel_read = optarg;
@@ -2465,9 +2460,6 @@ int main(int argc, char **argv) 
		case 's':

			vmlinux_section_warnings = 0;

			break;

		case 'S':

			sec_mismatch_verbose = 0;

			break;

		case 'T':

			files_source = optarg;

			break;
@@ -2525,18 +2517,9 @@ int main(int argc, char **argv) 
	}

	if (dump_write)

		write_dump(dump_write);

	if (sec_mismatch_count) {

		if (!sec_mismatch_verbose) {

			warn("modpost: Found %d section mismatch(es).\n"

			     "To see full details build your kernel with:\n"

			     "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",

			     sec_mismatch_count);

		}

		if (sec_mismatch_fatal) {

	if (sec_mismatch_count && sec_mismatch_fatal)

		fatal("modpost: Section mismatches detected.\n"

		      "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n");

		}

	}

	free(buf.p);



	return err;