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

Commit 25601209 authored by Russell King's avatar Russell King Committed by Sam Ravnborg
Browse files

kbuild: make modpost section warnings clearer 



Change modpost section mismatch warnings to be less confusing;
model them on the binutils linker warnings which we all know how
to interpret.

Also, fix the wrong ordering of arguments for the final case -
fromsec and refsymname were reversed.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarAcked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 03c9587d

scripts/mod/modpost.c

+16 −17
Original line number Diff line number Diff line
@@ -885,29 +885,28 @@ static void warn_sec_mismatch(const char *modname, const char *fromsec, 
		return;



	if (before && after) {

		warn("%s - Section mismatch: reference to %s:%s from %s "

		     "between '%s' (at offset 0x%llx) and '%s'\n",

		     modname, secname, refsymname, fromsec,

		warn("%s(%s+0x%llx): Section mismatch: reference to %s:%s "

		     "(between '%s' and '%s')\n",

		     modname, fromsec, (unsigned long long)r.r_offset,

		     secname, refsymname,

		     elf->strtab + before->st_name,

		     (long long)r.r_offset,

		     elf->strtab + after->st_name);

	} else if (before) {

		warn("%s - Section mismatch: reference to %s:%s from %s "

		     "after '%s' (at offset 0x%llx)\n",

		     modname, secname, refsymname, fromsec,

		     elf->strtab + before->st_name,

		     (long long)r.r_offset);

		warn("%s(%s+0x%llx): Section mismatch: reference to %s:%s "

		     "(after '%s')\n",

		     modname, fromsec, (unsigned long long)r.r_offset,

		     secname, refsymname,

		     elf->strtab + before->st_name);

	} else if (after) {

		warn("%s - Section mismatch: reference to %s:%s from %s "

		warn("%s(%s+0x%llx): Section mismatch: reference to %s:%s "

		     "before '%s' (at offset -0x%llx)\n",

		     modname, secname, refsymname, fromsec,

		     elf->strtab + after->st_name,

		     (long long)r.r_offset);

		     modname, fromsec, (unsigned long long)r.r_offset,

		     secname, refsymname,

		     elf->strtab + after->st_name);

	} else {

		warn("%s - Section mismatch: reference to %s:%s from %s "

		     "(offset 0x%llx)\n",

		     modname, secname, fromsec, refsymname,

		     (long long)r.r_offset);

		warn("%s(%s+0x%llx): Section mismatch: reference to %s:%s\n",

		     modname, fromsec, (unsigned long long)r.r_offset,

		     secname, refsymname);

	}

}