diff options
Diffstat (limited to 'scripts/mod/file2alias.c')
| -rw-r--r-- | scripts/mod/file2alias.c | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 7da9735e7ab3..00586119a25b 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -1476,8 +1476,8 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, { void *symval; char *zeros = NULL; - const char *type, *name, *modname; - size_t typelen, modnamelen; + const char *type, *name; + size_t typelen; static const char *prefix = "__mod_device_table__"; /* We're looking for a section relative symbol */ @@ -1488,20 +1488,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT) return; - /* All our symbols are of form __mod_device_table__kmod_<modname>__<type>__<name>. */ + /* All our symbols are of form __mod_device_table__<type>__<name>. */ if (!strstarts(symname, prefix)) return; - - modname = strstr(symname, "__kmod_"); - if (!modname) - return; - modname += strlen("__kmod_"); - - type = strstr(modname, "__"); - if (!type) - return; - modnamelen = type - modname; - type += strlen("__"); + type = symname + strlen(prefix); name = strstr(type, "__"); if (!name) @@ -1527,21 +1517,5 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, } } - if (mod->is_vmlinux) { - struct module_alias *alias; - - /* - * If this is vmlinux, record the name of the builtin module. - * Traverse the linked list in the reverse order, and set the - * builtin_modname unless it has already been set in the - * previous call. - */ - list_for_each_entry_reverse(alias, &mod->aliases, node) { - if (alias->builtin_modname) - break; - alias->builtin_modname = xstrndup(modname, modnamelen); - } - } - free(zeros); } |