android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I56eccc6e9bce6eaf805e84f34e67975284efb05a
This commit is contained in:
Greg Kroah-Hartman 2019-10-28 14:45:22 +01:00
parent 444da424c1
commit 54087918b8
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/mod/modpost.c
View File

@ -1987,16 +1987,6 @@ static void read_symbols(const char *modname)
handle_moddevtable(mod, &info, sym, symname); 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 // check for static EXPORT_SYMBOL_* functions && global vars
for (sym = info.symtab_start; sym < info.symtab_stop; sym++) { for (sym = info.symtab_start; sym < info.symtab_stop; sym++) {
unsigned char bind = ELF_ST_BIND(sym->st_info); 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->preloaded = 1;
s->is_static = 0; s->is_static = 0;
sym_update_crc(symname, mod, crc, export_no(export)); sym_update_crc(symname, mod, crc, export_no(export));
sym_update_namespace(symname, namespace);
} }
release_file(file, size); release_file(file, size);
return; return;