Merge commit 'v2.6.35' into kbuild/kbuild

[sfrench/cifs-2.6.git] / scripts / mod / file2alias.c

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 9cf2400580a72a586b501c0c5d831473ea49dd77..88f3f07205f88647e5665858f40fde875deec763 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -828,6 +828,19 @@ static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
        return 1;
 }
 
+/* looks like: "pnp:dD" */
+static int do_isapnp_entry(const char *filename,
+                          struct isapnp_device_id *id, char *alias)
+{
+       sprintf(alias, "pnp:d%c%c%c%x%x%x%x*",
+               'A' + ((id->vendor >> 2) & 0x3f) - 1,
+               'A' + (((id->vendor & 3) << 3) | ((id->vendor >> 13) & 7)) - 1,
+               'A' + ((id->vendor >> 8) & 0x1f) - 1,
+               (id->function >> 4) & 0x0f, id->function & 0x0f,
+               (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
+       return 1;
+}
+
 /* Ignore any prefix, eg. some architectures prepend _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -871,16 +884,16 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
        char *zeros = NULL;
 
        /* We're looking for a section relative symbol */
-       if (!sym->st_shndx || sym->st_shndx >= info->hdr->e_shnum)
+       if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)
                return;
 
        /* Handle all-NULL symbols allocated into .bss */
-       if (info->sechdrs[sym->st_shndx].sh_type & SHT_NOBITS) {
+       if (info->sechdrs[get_secindex(info, sym)].sh_type & SHT_NOBITS) {
                zeros = calloc(1, sym->st_size);
                symval = zeros;
        } else {
                symval = (void *)info->hdr
-                       + info->sechdrs[sym->st_shndx].sh_offset
+                       + info->sechdrs[get_secindex(info, sym)].sh_offset
                        + sym->st_value;
        }
 
@@ -983,6 +996,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                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);
 }