Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21bdd17b authored by Tom Gundersen's avatar Tom Gundersen Committed by Rusty Russell
Browse files

module: allow multiple calls to MODULE_DEVICE_TABLE() per module 



Commit 78551277: "Input: i8042 - add PNP modaliases" had a bug, where the
second call to MODULE_DEVICE_TABLE() overrode the first resulting in not all
the modaliases being exposed.

This fixes the problem by including the name of the device_id table in the
__mod_*_device_table alias, allowing us to export several device_id tables
per module.

Suggested-by: default avatarKay Sievers <kay@vrfy.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarTom Gundersen <teg@jklm.no>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 27bba4d6

include/linux/module.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ extern const struct gtype##_id __mod_##gtype##_table \ 
#define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description)



#define MODULE_DEVICE_TABLE(type, name)		\

  MODULE_GENERIC_TABLE(type##_device, name)

  MODULE_GENERIC_TABLE(type##__##name##_device, name)



/* Version of form [<epoch>:]<version>[-<extra-version>].

 * Or for CVS/RCS ID version, everything but the number is stripped.

scripts/mod/file2alias.c

+9 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ typedef unsigned char __u8; 


/* This array collects all instances that use the generic do_table */

struct devtable {

	const char *device_id; /* name of table, __mod_<name>_device_table. */

	const char *device_id; /* name of table, __mod_<name>__*_device_table. */

	unsigned long id_size;

	void *function;

};
@@ -146,7 +146,8 @@ static void device_id_check(const char *modname, const char *device_id, 


	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_device_table=%lu.\n"

		      "of the size of "

		      "section __mod_%s__<identifier>_device_table=%lu.\n"

		      "Fix definition of struct %s_device_id "

		      "in mod_devicetable.h\n",

		      modname, device_id, id_size, device_id, size, device_id);
@@ -1206,7 +1207,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, 
{

	void *symval;

	char *zeros = NULL;

	const char *name;

	const char *name, *identifier;

	unsigned int namelen;



	/* We're looking for a section relative symbol */
@@ -1217,7 +1218,7 @@ 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 <prefix>__mod_XXX_device_table. */

	/* All our symbols are of form <prefix>__mod_<name>__<identifier>_device_table. */

	name = strstr(symname, "__mod_");

	if (!name)

		return;
@@ -1227,7 +1228,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, 
		return;

	if (strcmp(name + namelen - strlen("_device_table"), "_device_table"))

		return;

	namelen -= strlen("_device_table");

	identifier = strstr(name, "__");

	if (!identifier)

		return;

	namelen = identifier - name;



	/* Handle all-NULL symbols allocated into .bss */

	if (info->sechdrs[get_secindex(info, sym)].sh_type & SHT_NOBITS) {