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

modpost: turn section mismatches to error from fatal() 



There is code that reports static EXPORT_SYMBOL a few lines below.
It is not a good idea to bail out here.

I renamed sec_mismatch_fatal to sec_mismatch_warn_only (with logical
inversion) to match to CONFIG_SECTION_MISMATCH_WARN_ONLY.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent d6d692fa

scripts/mod/modpost.c

+4 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static int external_module = 0; 
static int warn_unresolved = 0;

/* How a symbol is exported */

static int sec_mismatch_count = 0;

static int sec_mismatch_fatal = 0;

static int sec_mismatch_warn_only = true;

/* ignore missing files */

static int ignore_missing_files;

/* If set to 1, only warn (instead of error) about missing ns imports */
@@ -2576,7 +2576,7 @@ int main(int argc, char **argv) 
			warn_unresolved = 1;

			break;

		case 'E':

			sec_mismatch_fatal = 1;

			sec_mismatch_warn_only = false;

			break;

		case 'N':

			allow_missing_ns_imports = 1;
@@ -2640,8 +2640,8 @@ int main(int argc, char **argv) 


	if (dump_write)

		write_dump(dump_write);

	if (sec_mismatch_count && sec_mismatch_fatal)

		fatal("Section mismatches detected.\n"

	if (sec_mismatch_count && !sec_mismatch_warn_only)

		error("Section mismatches detected.\n"

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

	for (n = 0; n < SYMBOL_HASH_SIZE; n++) {

		struct symbol *s;

CRA Git | Maintained and supported by SUSTech CRA and CCSE