1 files changed, 115 insertions, 259 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index df4fc23dd83..e26e2fb462d 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -28,7 +28,6 @@ typedef Elf64_Addr	kernel_ulong_t;
 #endif
 
 #include <ctype.h>
-#include <stdbool.h>
 
 typedef uint32_t        __u32;
 typedef uint16_t        __u16;
@@ -39,61 +38,6 @@ typedef unsigned char	__u8;
  * we handle those differences explicitly below */
 #include "../../include/linux/mod_devicetable.h"
 
-/* This array collects all instances that use the generic do_table */
-struct devtable {
-        const char *device_id; /* name of table, __mod_<name>_device_table. */
-        unsigned long id_size;
-        void *function;
-};
-
-#define ___cat(a,b) a ## b
-#define __cat(a,b) ___cat(a,b)
-
-/* we need some special handling for this host tool running eventually on
- * Darwin. The Mach-O section handling is a bit different than ELF section
- * handling. The differnces in detail are:
- *  a) we have segments which have sections
- *  b) we need a API call to get the respective section symbols */
-#if defined(__MACH__)
-#include <mach-o/getsect.h>
-
-#define INIT_SECTION(name)  do {                                        \
-                unsigned long name ## _len;                             \
-                char *__cat(pstart_,name) = getsectdata("__TEXT",       \
-                        #name, &__cat(name,_len));                      \
-                char *__cat(pstop_,name) = __cat(pstart_,name) +        \
-                        __cat(name, _len);                              \
-                __cat(__start_,name) = (void *)__cat(pstart_,name);     \
-                __cat(__stop_,name) = (void *)__cat(pstop_,name);       \
-        } while (0)
-#define SECTION(name)   __attribute__((section("__TEXT, " #name)))
-
-struct devtable **__start___devtable, **__stop___devtable;
-#else
-#define INIT_SECTION(name) /* no-op for ELF */
-#define SECTION(name)   __attribute__((section(#name)))
-
-/* We construct a table of pointers in an ELF section (pointers generally
- * go unpadded by gcc).  ld creates boundary syms for us. */
-extern struct devtable *__start___devtable[], *__stop___devtable[];
-#endif /* __MACH__ */
-
-#if __GNUC__ == 3 && __GNUC_MINOR__ < 3
-# define __used                 __attribute__((__unused__))
-#else
-# define __used                 __attribute__((__used__))
-#endif
-
-/* Add a table entry.  We test function type matches while we're here. */
-#define ADD_TO_DEVTABLE(device_id, type, function) \
-        static struct devtable __cat(devtable,__LINE__) = {     \
-                device_id + 0*sizeof((function)((const char *)NULL,     \
-                                                (type *)NULL,           \
-                                                (char *)NULL)),         \
-                sizeof(type), (function) };                             \
-        static struct devtable *SECTION(__devtable) __used \
-                __cat(devtable_ptr,__LINE__) = &__cat(devtable,__LINE__)
-
 #define ADD(str, sep, cond, field)                              \
 do {                                                            \
         strcat(str, sep);                                       \
@@ -156,7 +100,7 @@ static void device_id_check(const char *modname, const char *device_id,
 }
 
 /* USB is special because the bcdDevice can be matched against a numeric range */
-/* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipNinN" */
+/* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipN" */
 static void do_usb_entry(struct usb_device_id *id,
                          unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
                          unsigned char range_lo, unsigned char range_hi,
@@ -210,9 +154,6 @@ static void do_usb_entry(struct usb_device_id *id,
         ADD(alias, "ip",
             id->match_flags&USB_DEVICE_ID_MATCH_INT_PROTOCOL,
             id->bInterfaceProtocol);
-        ADD(alias, "in",
-            id->match_flags&USB_DEVICE_ID_MATCH_INT_NUMBER,
-            id->bInterfaceNumber);
 
         add_wildcard(alias);
         buf_printf(&mod->dev_table_buf,
@@ -339,19 +280,15 @@ static int do_hid_entry(const char *filename,
                              struct hid_device_id *id, char *alias)
 {
         id->bus = TO_NATIVE(id->bus);
-        id->group = TO_NATIVE(id->group);
         id->vendor = TO_NATIVE(id->vendor);
         id->product = TO_NATIVE(id->product);
 
-        sprintf(alias, "hid:");
-        ADD(alias, "b", id->bus != HID_BUS_ANY, id->bus);
-        ADD(alias, "g", id->group != HID_GROUP_ANY, id->group);
+        sprintf(alias, "hid:b%04X", id->bus);
         ADD(alias, "v", id->vendor != HID_ANY_ID, id->vendor);
         ADD(alias, "p", id->product != HID_ANY_ID, id->product);
 
         return 1;
 }
-ADD_TO_DEVTABLE("hid", struct hid_device_id, do_hid_entry);
 
 /* Looks like: ieee1394:venNmoNspNverN */
 static int do_ieee1394_entry(const char *filename,
@@ -376,7 +313,6 @@ static int do_ieee1394_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("ieee1394", struct ieee1394_device_id, do_ieee1394_entry);
 
 /* Looks like: pci:vNdNsvNsdNbcNscNiN. */
 static int do_pci_entry(const char *filename,
@@ -420,7 +356,6 @@ static int do_pci_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("pci", struct pci_device_id, do_pci_entry);
 
 /* looks like: "ccw:tNmNdtNdmN" */
 static int do_ccw_entry(const char *filename,
@@ -444,7 +379,6 @@ static int do_ccw_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("ccw", struct ccw_device_id, do_ccw_entry);
 
 /* looks like: "ap:tN" */
 static int do_ap_entry(const char *filename,
@@ -453,7 +387,6 @@ static int do_ap_entry(const char *filename,
         sprintf(alias, "ap:t%02X*", id->dev_type);
         return 1;
 }
-ADD_TO_DEVTABLE("ap", struct ap_device_id, do_ap_entry);
 
 /* looks like: "css:tN" */
 static int do_css_entry(const char *filename,
@@ -462,7 +395,6 @@ static int do_css_entry(const char *filename,
         sprintf(alias, "css:t%01X", id->type);
         return 1;
 }
-ADD_TO_DEVTABLE("css", struct css_device_id, do_css_entry);
 
 /* Looks like: "serio:tyNprNidNexN" */
 static int do_serio_entry(const char *filename,
@@ -482,7 +414,6 @@ static int do_serio_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("serio", struct serio_device_id, do_serio_entry);
 
 /* looks like: "acpi:ACPI0003 or acpi:PNP0C0B" or "acpi:LNXVIDEO" */
 static int do_acpi_entry(const char *filename,
@@ -491,7 +422,6 @@ static int do_acpi_entry(const char *filename,
         sprintf(alias, "acpi*:%s:*", id->id);
         return 1;
 }
-ADD_TO_DEVTABLE("acpi", struct acpi_device_id, do_acpi_entry);
 
 /* looks like: "pnp:dD" */
 static void do_pnp_device_entry(void *symval, unsigned long size,
@@ -614,7 +544,8 @@ static int do_pcmcia_entry(const char *filename,
         add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("pcmcia", struct pcmcia_device_id, do_pcmcia_entry);
+
+
 
 static int do_of_entry (const char *filename, struct of_device_id *of, char *alias)
 {
@@ -637,7 +568,6 @@ static int do_of_entry (const char *filename, struct of_device_id *of, char *ali
     add_wildcard(alias);
     return 1;
 }
-ADD_TO_DEVTABLE("of", struct of_device_id, do_of_entry);
 
 static int do_vio_entry(const char *filename, struct vio_device_id *vio,
                 char *alias)
@@ -655,7 +585,6 @@ static int do_vio_entry(const char *filename, struct vio_device_id *vio,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("vio", struct vio_device_id, do_vio_entry);
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
@@ -711,7 +640,6 @@ static int do_input_entry(const char *filename, struct input_device_id *id,
                 do_input(alias, id->swbit, 0, INPUT_DEVICE_ID_SW_MAX);
         return 1;
 }
-ADD_TO_DEVTABLE("input", struct input_device_id, do_input_entry);
 
 static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa,
                 char *alias)
@@ -722,7 +650,6 @@ static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa,
                 strcat(alias, "*");
         return 1;
 }
-ADD_TO_DEVTABLE("eisa", struct eisa_device_id, do_eisa_entry);
 
 /* Looks like: parisc:tNhvNrevNsvN */
 static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
@@ -742,7 +669,6 @@ static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("parisc", struct parisc_device_id, do_parisc_entry);
 
 /* Looks like: sdio:cNvNdN. */
 static int do_sdio_entry(const char *filename,
@@ -759,7 +685,6 @@ static int do_sdio_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("sdio", struct sdio_device_id, do_sdio_entry);
 
 /* Looks like: ssb:vNidNrevN. */
 static int do_ssb_entry(const char *filename,
@@ -776,7 +701,6 @@ static int do_ssb_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("ssb", struct ssb_device_id, do_ssb_entry);
 
 /* Looks like: bcma:mNidNrevNclN. */
 static int do_bcma_entry(const char *filename,
@@ -795,7 +719,6 @@ static int do_bcma_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("bcma", struct bcma_device_id, do_bcma_entry);
 
 /* Looks like: virtio:dNvN */
 static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
@@ -811,29 +734,6 @@ static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
         add_wildcard(alias);
         return 1;
 }
-ADD_TO_DEVTABLE("virtio", struct virtio_device_id, do_virtio_entry);
-
-/*
- * Looks like: vmbus:guid
- * Each byte of the guid will be represented by two hex characters
- * in the name.
- */
-
-static int do_vmbus_entry(const char *filename, struct hv_vmbus_device_id *id,
-                          char *alias)
-{
-        int i;
-        char guid_name[((sizeof(id->guid) + 1)) * 2];
-
-        for (i = 0; i < (sizeof(id->guid) * 2); i += 2)
-                sprintf(&guid_name[i], "%02x", id->guid[i/2]);
-
-        strcpy(alias, "vmbus:");
-        strcat(alias, guid_name);
-
-        return 1;
-}
-ADD_TO_DEVTABLE("vmbus", struct hv_vmbus_device_id, do_vmbus_entry);
 
 /* Looks like: i2c:S */
 static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
@@ -843,7 +743,6 @@ static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
 
         return 1;
 }
-ADD_TO_DEVTABLE("i2c", struct i2c_device_id, do_i2c_entry);
 
 /* Looks like: spi:S */
 static int do_spi_entry(const char *filename, struct spi_device_id *id,
@@ -853,7 +752,6 @@ static int do_spi_entry(const char *filename, struct spi_device_id *id,
 
         return 1;
 }
-ADD_TO_DEVTABLE("spi", struct spi_device_id, do_spi_entry);
 
 static const struct dmifield {
         const char *prefix;
@@ -908,7 +806,6 @@ static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
         strcat(alias, ":");
         return 1;
 }
-ADD_TO_DEVTABLE("dmi", struct dmi_system_id, do_dmi_entry);
 
 static int do_platform_entry(const char *filename,
                              struct platform_device_id *id, char *alias)
@@ -916,7 +813,6 @@ static int do_platform_entry(const char *filename,
         sprintf(alias, PLATFORM_MODULE_PREFIX "%s", id->name);
         return 1;
 }
-ADD_TO_DEVTABLE("platform", struct platform_device_id, do_platform_entry);
 
 static int do_mdio_entry(const char *filename,
                          struct mdio_device_id *id, char *alias)
@@ -939,7 +835,6 @@ static int do_mdio_entry(const char *filename,
 
         return 1;
 }
-ADD_TO_DEVTABLE("mdio", struct mdio_device_id, do_mdio_entry);
 
 /* Looks like: zorro:iN. */
 static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
@@ -950,7 +845,6 @@ static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
         ADD(alias, "i", id->id != ZORRO_WILDCARD, id->id);
         return 1;
 }
-ADD_TO_DEVTABLE("zorro", struct zorro_device_id, do_zorro_entry);
 
 /* looks like: "pnp:dD" */
 static int do_isapnp_entry(const char *filename,
@@ -964,124 +858,16 @@ static int do_isapnp_entry(const char *filename,
                 (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
         return 1;
 }
-ADD_TO_DEVTABLE("isapnp", struct isapnp_device_id, do_isapnp_entry);
 
-/* Looks like: "ipack:fNvNdN". */
-static int do_ipack_entry(const char *filename,
-                          struct ipack_device_id *id, char *alias)
+/* Ignore any prefix, eg. some architectures prepend _ */
+static inline int sym_is(const char *symbol, const char *name)
 {
-        id->vendor = TO_NATIVE(id->vendor);
-        id->device = TO_NATIVE(id->device);
-        strcpy(alias, "ipack:");
-        ADD(alias, "f", id->format != IPACK_ANY_FORMAT, id->format);
-        ADD(alias, "v", id->vendor != IPACK_ANY_ID, id->vendor);
-        ADD(alias, "d", id->device != IPACK_ANY_ID, id->device);
-        add_wildcard(alias);
-        return 1;
-}
-ADD_TO_DEVTABLE("ipack", struct ipack_device_id, do_ipack_entry);
-
-/*
- * Append a match expression for a single masked hex digit.
- * outp points to a pointer to the character at which to append.
- *      *outp is updated on return to point just after the appended text,
- *      to facilitate further appending.
- */
-static void append_nibble_mask(char **outp,
-                               unsigned int nibble, unsigned int mask)
-{
-        char *p = *outp;
-        unsigned int i;
-
-        switch (mask) {
-        case 0:
-                *p++ = '?';
-                break;
-
-        case 0xf:
-                p += sprintf(p, "%X",  nibble);
-                break;
-
-        default:
-                /*
-                 * Dumbly emit a match pattern for all possible matching
-                 * digits.  This could be improved in some cases using ranges,
-                 * but it has the advantage of being trivially correct, and is
-                 * often optimal.
-                 */
-                *p++ = '[';
-                for (i = 0; i < 0x10; i++)
-                        if ((i & mask) == nibble)
-                                p += sprintf(p, "%X", i);
-                *p++ = ']';
-        }
-
-        /* Ensure that the string remains NUL-terminated: */
-        *p = '\0';
+        const char *match;
 
-        /* Advance the caller's end-of-string pointer: */
-        *outp = p;
-}
-
-/*
- * looks like: "amba:dN"
- *
- * N is exactly 8 digits, where each is an upper-case hex digit, or
- *      a ? or [] pattern matching exactly one digit.
- */
-static int do_amba_entry(const char *filename,
-                         struct amba_id *id, char *alias)
-{
-        unsigned int digit;
-        char *p = alias;
-
-        if ((id->id & id->mask) != id->id)
-                fatal("%s: Masked-off bit(s) of AMBA device ID are non-zero: "
-                      "id=0x%08X, mask=0x%08X.  Please fix this driver.\n",
-                      filename, id->id, id->mask);
-
-        p += sprintf(alias, "amba:d");
-        for (digit = 0; digit < 8; digit++)
-                append_nibble_mask(&p,
-                                   (id->id >> (4 * (7 - digit))) & 0xf,
-                                   (id->mask >> (4 * (7 - digit))) & 0xf);
-
-        return 1;
-}
-ADD_TO_DEVTABLE("amba", struct amba_id, do_amba_entry);
-
-/* LOOKS like x86cpu:vendor:VVVV:family:FFFF:model:MMMM:feature:*,FEAT,*
- * All fields are numbers. It would be nicer to use strings for vendor
- * and feature, but getting those out of the build system here is too
- * complicated.
- */
-
-static int do_x86cpu_entry(const char *filename, struct x86_cpu_id *id,
-                           char *alias)
-{
-        id->feature = TO_NATIVE(id->feature);
-        id->family = TO_NATIVE(id->family);
-        id->model = TO_NATIVE(id->model);
-        id->vendor = TO_NATIVE(id->vendor);
-
-        strcpy(alias, "x86cpu:");
-        ADD(alias, "vendor:",  id->vendor != X86_VENDOR_ANY, id->vendor);
-        ADD(alias, ":family:", id->family != X86_FAMILY_ANY, id->family);
-        ADD(alias, ":model:",  id->model  != X86_MODEL_ANY,  id->model);
-        strcat(alias, ":feature:*");
-        if (id->feature != X86_FEATURE_ANY)
-                sprintf(alias + strlen(alias), "%04X*", id->feature);
-        return 1;
-}
-ADD_TO_DEVTABLE("x86cpu", struct x86_cpu_id, do_x86cpu_entry);
-
-/* Does namelen bytes of name exactly match the symbol? */
-static bool sym_is(const char *name, unsigned namelen, const char *symbol)
-{
-        if (namelen != strlen(symbol))
-                return false;
-
-        return memcmp(name, symbol, namelen) == 0;
+        match = strstr(symbol, name);
+        if (!match)
+                return 0;
+        return match[strlen(name)] == '\0';
 }
 
 static void do_table(void *symval, unsigned long size,
@@ -1114,29 +900,11 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
 {
         void *symval;
         char *zeros = NULL;
-        const char *name;
-        unsigned int namelen;
 
         /* We're looking for a section relative symbol */
         if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)
                 return;
 
-        /* We're looking for an object */
-        if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT)
-                return;
-
-        /* All our symbols are of form <prefix>__mod_XXX_device_table. */
-        name = strstr(symname, "__mod_");
-        if (!name)
-                return;
-        name += strlen("__mod_");
-        namelen = strlen(name);
-        if (namelen < strlen("_device_table"))
-                return;
-        if (strcmp(name + namelen - strlen("_device_table"), "_device_table"))
-                return;
-        namelen -= strlen("_device_table");
-
         /* Handle all-NULL symbols allocated into .bss */
         if (info->sechdrs[get_secindex(info, sym)].sh_type & SHT_NOBITS) {
                 zeros = calloc(1, sym->st_size);
@@ -1147,25 +915,113 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                         + sym->st_value;
         }
 
-        /* First handle the "special" cases */
-        if (sym_is(name, namelen, "usb"))
+        if (sym_is(symname, "__mod_pci_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct pci_device_id), "pci",
+                         do_pci_entry, mod);
+        else if (sym_is(symname, "__mod_usb_device_table"))
+                /* special case to handle bcdDevice ranges */
                 do_usb_table(symval, sym->st_size, mod);
-        else if (sym_is(name, namelen, "pnp"))
+        else if (sym_is(symname, "__mod_hid_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct hid_device_id), "hid",
+                         do_hid_entry, mod);
+        else if (sym_is(symname, "__mod_ieee1394_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct ieee1394_device_id), "ieee1394",
+                         do_ieee1394_entry, mod);
+        else if (sym_is(symname, "__mod_ccw_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct ccw_device_id), "ccw",
+                         do_ccw_entry, mod);
+        else if (sym_is(symname, "__mod_ap_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct ap_device_id), "ap",
+                         do_ap_entry, mod);
+        else if (sym_is(symname, "__mod_css_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct css_device_id), "css",
+                         do_css_entry, mod);
+        else if (sym_is(symname, "__mod_serio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct serio_device_id), "serio",
+                         do_serio_entry, mod);
+        else if (sym_is(symname, "__mod_acpi_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct acpi_device_id), "acpi",
+                         do_acpi_entry, mod);
+        else if (sym_is(symname, "__mod_pnp_device_table"))
                 do_pnp_device_entry(symval, sym->st_size, mod);
-        else if (sym_is(name, namelen, "pnp_card"))
+        else if (sym_is(symname, "__mod_pnp_card_device_table"))
                 do_pnp_card_entries(symval, sym->st_size, mod);
-        else {
-                struct devtable **p;
-                INIT_SECTION(__devtable);
-
-                for (p = __start___devtable; p < __stop___devtable; p++) {
-                        if (sym_is(name, namelen, (*p)->device_id)) {
-                                do_table(symval, sym->st_size, (*p)->id_size,
-                                         (*p)->device_id, (*p)->function, mod);
-                                break;
-                        }
-                }
-        }
+        else if (sym_is(symname, "__mod_pcmcia_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct pcmcia_device_id), "pcmcia",
+                         do_pcmcia_entry, mod);
+        else if (sym_is(symname, "__mod_of_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct of_device_id), "of",
+                         do_of_entry, mod);
+        else if (sym_is(symname, "__mod_vio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct vio_device_id), "vio",
+                         do_vio_entry, mod);
+        else if (sym_is(symname, "__mod_input_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct input_device_id), "input",
+                         do_input_entry, mod);
+        else if (sym_is(symname, "__mod_eisa_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct eisa_device_id), "eisa",
+                         do_eisa_entry, mod);
+        else if (sym_is(symname, "__mod_parisc_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct parisc_device_id), "parisc",
+                         do_parisc_entry, mod);
+        else if (sym_is(symname, "__mod_sdio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct sdio_device_id), "sdio",
+                         do_sdio_entry, mod);
+        else if (sym_is(symname, "__mod_ssb_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct ssb_device_id), "ssb",
+                         do_ssb_entry, mod);
+        else if (sym_is(symname, "__mod_bcma_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct bcma_device_id), "bcma",
+                         do_bcma_entry, mod);
+        else if (sym_is(symname, "__mod_virtio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct virtio_device_id), "virtio",
+                         do_virtio_entry, mod);
+        else if (sym_is(symname, "__mod_i2c_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct i2c_device_id), "i2c",
+                         do_i2c_entry, mod);
+        else if (sym_is(symname, "__mod_spi_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct spi_device_id), "spi",
+                         do_spi_entry, mod);
+        else if (sym_is(symname, "__mod_dmi_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct dmi_system_id), "dmi",
+                         do_dmi_entry, mod);
+        else if (sym_is(symname, "__mod_platform_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct platform_device_id), "platform",
+                         do_platform_entry, mod);
+        else if (sym_is(symname, "__mod_mdio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct mdio_device_id), "mdio",
+                         do_mdio_entry, mod);
+        else if (sym_is(symname, "__mod_zorro_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct zorro_device_id), "zorro",
+                         do_zorro_entry, mod);
+        else if (sym_is(symname, "__mod_isapnp_device_table"))
+                do_table(symval, sym->st_size,
+                        sizeof(struct isapnp_device_id), "isa",
+                        do_isapnp_entry, mod);
         free(zeros);
 }