Commit 7390b94a authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Luis Chamberlain

module: merge check_exported_symbol() into find_exported_symbol_in_section()

Now check_exported_symbol() always succeeds.

Merge it into find_exported_symbol_in_search() to make the code concise.
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent cdd66eb5
...@@ -243,17 +243,6 @@ static __maybe_unused void *any_section_objs(const struct load_info *info, ...@@ -243,17 +243,6 @@ static __maybe_unused void *any_section_objs(const struct load_info *info,
#define symversion(base, idx) ((base != NULL) ? ((base) + (idx)) : NULL) #define symversion(base, idx) ((base != NULL) ? ((base) + (idx)) : NULL)
#endif #endif
static bool check_exported_symbol(const struct symsearch *syms,
struct module *owner, unsigned int symnum,
struct find_symbol_arg *fsa)
{
fsa->owner = owner;
fsa->crc = symversion(syms->crcs, symnum);
fsa->sym = &syms->start[symnum];
fsa->license = syms->license;
return true;
}
static const char *kernel_symbol_name(const struct kernel_symbol *sym) static const char *kernel_symbol_name(const struct kernel_symbol *sym)
{ {
#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS #ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS
...@@ -290,12 +279,15 @@ static bool find_exported_symbol_in_section(const struct symsearch *syms, ...@@ -290,12 +279,15 @@ static bool find_exported_symbol_in_section(const struct symsearch *syms,
sym = bsearch(fsa->name, syms->start, syms->stop - syms->start, sym = bsearch(fsa->name, syms->start, syms->stop - syms->start,
sizeof(struct kernel_symbol), cmp_name); sizeof(struct kernel_symbol), cmp_name);
if (!sym)
return false;
if (sym != NULL && check_exported_symbol(syms, owner, fsa->owner = owner;
sym - syms->start, fsa)) fsa->crc = symversion(syms->crcs, sym - syms->start);
return true; fsa->sym = sym;
fsa->license = syms->license;
return false; return true;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment