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

Commit 54087918 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ANDROID: modpost: fix up merge issues due to namespace removal 



module namespaces are ripped out at the moment, so the 5.4-rc5 merge
didn't quite go "well" because of that.  This should resolve those
issues.

Cc: Matthias Männich <maennich@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I56eccc6e9bce6eaf805e84f34e67975284efb05a
parent 444da424

scripts/mod/modpost.c

+0 −11
Original line number Diff line number Diff line
@@ -1987,16 +1987,6 @@ static void read_symbols(const char *modname) 
		handle_moddevtable(mod, &info, sym, symname);

	}



	/* Apply symbol namespaces from __kstrtabns_<symbol> entries. */

	for (sym = info.symtab_start; sym < info.symtab_stop; sym++) {

		symname = remove_dot(info.strtab + sym->st_name);



		if (strstarts(symname, "__kstrtabns_"))

			sym_update_namespace(symname + strlen("__kstrtabns_"),

					     namespace_from_kstrtabns(&info,

								      sym));

	}



	// check for static EXPORT_SYMBOL_* functions && global vars

	for (sym = info.symtab_start; sym < info.symtab_stop; sym++) {

		unsigned char bind = ELF_ST_BIND(sym->st_info);
@@ -2398,7 +2388,6 @@ static void read_dump(const char *fname, unsigned int kernel) 
		s->preloaded = 1;

		s->is_static = 0;

		sym_update_crc(symname, mod, crc, export_no(export));

		sym_update_namespace(symname, namespace);

	}

	release_file(file, size);

	return;