niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

modpost: rename alias symbol for MODULE_DEVICE_TABLE()

Browse source 
This commit renames the alias symbol, __mod_<type>__<name>_device_table
to __mod_device_table__<type>__<name>.

This change simplifies the code slightly, as there is no longer a need
to check both the prefix and suffix.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2024-11-20 08:56:52 +09:00
parent 9a8ace8bb2
commit 054a9cd395
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/module.h
View file

@ -247,7 +247,7 @@ extern void cleanup_module(void);
#ifdef MODULE #ifdef MODULE
/* Creates an alias so file2alias.c can find device table. */ /* Creates an alias so file2alias.c can find device table. */
#define MODULE_DEVICE_TABLE(type, name) \ #define MODULE_DEVICE_TABLE(type, name) \
extern typeof(name) __mod_##type##__##name##_device_table \ extern typeof(name) __mod_device_table__##type##__##name \
__attribute__ ((unused, alias(__stringify(name)))) __attribute__ ((unused, alias(__stringify(name))))
#else /* !MODULE */ #else /* !MODULE */
#define MODULE_DEVICE_TABLE(type, name) #define MODULE_DEVICE_TABLE(type, name)

17
scripts/mod/file2alias.c
View file

@ -123,7 +123,7 @@ typedef struct {
#include "../../include/linux/mod_devicetable.h" #include "../../include/linux/mod_devicetable.h"
struct devtable { struct devtable {
const char *device_id; /* name of table, __mod_<name>__*_device_table. */ const char *device_id;
unsigned long id_size; unsigned long id_size;
void (*do_entry)(struct module *mod, void *symval); void (*do_entry)(struct module *mod, void *symval);
}; };
@ -190,7 +190,7 @@ static void device_id_check(const char *modname, const char *device_id,
int i; int i;
if (size % id_size || size < id_size) { if (size % id_size || size < id_size) {
fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo of the size of section __mod_%s__<identifier>_device_table=%lu.\n" fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo of the size of section __mod_device_table__%s__<identifier>=%lu.\n"
"Fix definition of struct %s_device_id in mod_devicetable.h\n", "Fix definition of struct %s_device_id in mod_devicetable.h\n",
modname, device_id, id_size, device_id, size, device_id); modname, device_id, id_size, device_id, size, device_id);
} }
@ -1505,6 +1505,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
char *zeros = NULL; char *zeros = NULL;
const char *type, *name; const char *type, *name;
size_t typelen; size_t typelen;
static const char *prefix = "__mod_device_table__";
/* We're looking for a section relative symbol */ /* We're looking for a section relative symbol */
if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections) if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)
@ -1514,15 +1515,11 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT) if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT)
return; return;
/* All our symbols are of form __mod_<type>__<name>_device_table. */ /* All our symbols are of form __mod_device_table__<type>__<name>. */
if (!strstarts(symname, "__mod_")) if (!strstarts(symname, prefix))
return;
type = symname + strlen("__mod_");
typelen = strlen(type);
if (typelen < strlen("_device_table"))
return;
if (strcmp(type + typelen - strlen("_device_table"), "_device_table"))
return; return;
type = symname + strlen(prefix);
name = strstr(type, "__"); name = strstr(type, "__");
if (!name) if (!name)
return; return;