ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

modpost: squash sym_update_namespace() into sym_add_exported()

Browse Source 
Pass a set of the name, license, and namespace to sym_add_exported().

sym_update_namespace() is unneeded.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
This commit is contained in:
Masahiro Yamada
2023-06-12 00:50:55 +09:00
parent 6d62b1c46b
commit 6e7611c485
1 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/mod/modpost.c
View File

@@ -355,26 +355,8 @@ static const char *sec_name(const struct elf_info *info, unsigned int secindex)
#define strstarts(str, prefix) (strncmp(str, prefix, strlen(prefix)) == 0) #define strstarts(str, prefix) (strncmp(str, prefix, strlen(prefix)) == 0)
static void sym_update_namespace(const char *symname, const char *namespace)
{
struct symbol *s = find_symbol(symname);
/*
* That symbol should have been created earlier and thus this is
* actually an assertion.
*/
if (!s) {
error("Could not update namespace(%s) for symbol %s\n",
namespace, symname);
return;
}
free(s->namespace);
s->namespace = namespace[0] ? NOFAIL(strdup(namespace)) : NULL;
}
static struct symbol *sym_add_exported(const char *name, struct module *mod, static struct symbol *sym_add_exported(const char *name, struct module *mod,
bool gpl_only) bool gpl_only, const char *namespace)
{ {
struct symbol *s = find_symbol(name); struct symbol *s = find_symbol(name);
@@ -387,6 +369,7 @@ static struct symbol *sym_add_exported(const char *name, struct module *mod,
s = alloc_symbol(name); s = alloc_symbol(name);
s->module = mod; s->module = mod;
s->is_gpl_only = gpl_only; s->is_gpl_only = gpl_only;
s->namespace = namespace[0] ? NOFAIL(strdup(namespace)) : NULL;
list_add_tail(&s->list, &mod->exported_symbols); list_add_tail(&s->list, &mod->exported_symbols);
hash_add_symbol(s); hash_add_symbol(s);
@@ -1236,8 +1219,7 @@ static void check_export_symbol(struct module *mod, struct elf_info *elf,
} }
data += strlen(data) + 1; /* namespace */ data += strlen(data) + 1; /* namespace */
s = sym_add_exported(name, mod, is_gpl); s = sym_add_exported(name, mod, is_gpl, data);
sym_update_namespace(name, data);
/* /*
* We need to be aware whether we are exporting a function or * We need to be aware whether we are exporting a function or
@@ -2180,9 +2162,8 @@ static void read_dump(const char *fname)
mod = new_module(modname, strlen(modname)); mod = new_module(modname, strlen(modname));
mod->from_dump = true; mod->from_dump = true;
} }
s = sym_add_exported(symname, mod, gpl_only); s = sym_add_exported(symname, mod, gpl_only, namespace);
sym_set_crc(s, crc); sym_set_crc(s, crc);
sym_update_namespace(symname, namespace);
} }
free(buf); free(buf);
return; return;