modpost: respect the previous export when 'exported twice' is warned (7ef9ab3b) · Commits · 戴 / test

scripts/mod/modpost.c

+11 −15

Original line number	Diff line number	Diff line
		@@ -211,13 +211,11 @@ static struct symbol new_symbol(const char name, struct module *module,
		enum export export)
		{
		unsigned int hash;
		struct symbol *new;

		hash = tdb_hash(name) % SYMBOL_HASH_SIZE;
		new = symbolhash[hash] = alloc_symbol(name, 0, symbolhash[hash]);
		new->module = module;
		new->export = export;
		return new;
		symbolhash[hash] = alloc_symbol(name, 0, symbolhash[hash]);

		return symbolhash[hash];
		}

		static struct symbol find_symbol(const char name)
		@@ -392,17 +390,15 @@ static struct symbol sym_add_exported(const char name, struct module *mod,

		if (!s) {
		s = new_symbol(name, mod, export);
		} else {
		if (!external_module \|\| is_vmlinux(s->module->name) \|\|
		} else if (!external_module \|\| is_vmlinux(s->module->name) \|\|
		s->module == mod) {
		warn("%s: '%s' exported twice. Previous export was in %s%s\n",
		mod->name, name, s->module->name,
		is_vmlinux(s->module->name) ? "" : ".ko");
		} else {
		/* In case Module.symvers was out of date */
		s->module = mod;
		}
		return s;
		}

		s->module = mod;
		s->vmlinux = is_vmlinux(mod->name);
		s->kernel = 0;
		s->export = export;