modpost: fix bogus 'exported twice' warnings. (b6568b1a) · Commits · 戴 / test

Andi's change in ("asmlinkage, module: Make ksymtab and kcrctab symbols and __this_module __visible") make the crc appear first in the symbol table. modpost creates an entry when it sees the CRC, then when it sees the actual symbol, it complains that it's seen it before. The preloaded flag already exists for the equivalent case where we loaded from Module.symvers, so use that. Reported-by:

Stephen Rothwell <sfr@canb.auug.org.au> Tested-by: The Awesome Power Of linux-next Signed-off-by:

Rusty Russell <rusty@rustcorp.com.au>

scripts/mod/modpost.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ struct symbol {
		unsigned int vmlinux:1; /* 1 if symbol is defined in vmlinux */
		unsigned int kernel:1; /* 1 if symbol is from kernel
		* (only for external modules) **/
		unsigned int preloaded:1; /* 1 if symbol from Module.symvers */
		unsigned int preloaded:1; /* 1 if symbol from Module.symvers, or crc */
		enum export export; /* Type of export */
		char name[0];
		};
		@@ -332,8 +332,11 @@ static void sym_update_crc(const char name, struct module mod,
		{
		struct symbol *s = find_symbol(name);

		if (!s)
		if (!s) {
		s = new_symbol(name, mod, export);
		/* Don't complain when we find it later. */
		s->preloaded = 1;
		}
		s->crc = crc;
		s->crc_valid = 1;
		}

Admin message