3 files changed, 59 insertions, 17 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index cea4a790e1e9..4c9890ec2528 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -304,6 +304,14 @@ static int do_ap_entry(const char *filename,
         return 1;
 }
 
+/* looks like: "css:tN" */
+static int do_css_entry(const char *filename,
+                        struct css_device_id *id, char *alias)
+{
+        sprintf(alias, "css:t%01X", id->type);
+        return 1;
+}
+
 /* Looks like: "serio:tyNprNidNexN" */
 static int do_serio_entry(const char *filename,
                           struct serio_device_id *id, char *alias)
@@ -332,11 +340,24 @@ static int do_acpi_entry(const char *filename,
 }
 
 /* looks like: "pnp:dD" */
-static int do_pnp_entry(const char *filename,
-                        struct pnp_device_id *id, char *alias)
+static void do_pnp_device_entry(void *symval, unsigned long size,
+                                struct module *mod)
 {
-        sprintf(alias, "pnp:d%s*", id->id);
-        return 1;
+        const unsigned long id_size = sizeof(struct pnp_device_id);
+        const unsigned int count = (size / id_size)-1;
+        const struct pnp_device_id *devs = symval;
+        unsigned int i;
+
+        device_id_check(mod->name, "pnp", size, id_size, symval);
+
+        for (i = 0; i < count; i++) {
+                const char *id = (char *)devs[i].id;
+
+                buf_printf(&mod->dev_table_buf,
+                           "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
+                buf_printf(&mod->dev_table_buf,
+                           "MODULE_ALIAS(\"acpi*:%s:*\");\n", id);
+        }
 }
 
 /* looks like: "pnp:dD" for every device of the card */
@@ -380,9 +401,12 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
                         }
 
                         /* add an individual alias for every device entry */
-                        if (!dup)
+                        if (!dup) {
                                 buf_printf(&mod->dev_table_buf,
                                            "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
+                                buf_printf(&mod->dev_table_buf,
+                                           "MODULE_ALIAS(\"acpi*:%s:*\");\n", id);
+                        }
                 }
         }
 }
@@ -605,7 +629,7 @@ static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
         return 1;
 }
 
-/* Ignore any prefix, eg. v850 prepends _ */
+/* Ignore any prefix, eg. some architectures prepend _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
         const char *match;
@@ -680,6 +704,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 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",
@@ -689,9 +717,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                          sizeof(struct acpi_device_id), "acpi",
                          do_acpi_entry, mod);
         else if (sym_is(symname, "__mod_pnp_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct pnp_device_id), "pnp",
-                         do_pnp_entry, mod);
+                do_pnp_device_entry(symval, sym->st_size, mod);
         else if (sym_is(symname, "__mod_pnp_card_device_table"))
                 do_pnp_card_entries(symval, sym->st_size, mod);
         else if (sym_is(symname, "__mod_pcmcia_device_table"))
diff --git a/scripts/mod/mk_elfconfig.c b/scripts/mod/mk_elfconfig.c
index db3881f14c2d..6a96d47bd1e6 100644
--- a/scripts/mod/mk_elfconfig.c
+++ b/scripts/mod/mk_elfconfig.c
@@ -55,7 +55,7 @@ main(int argc, char **argv)
         else
                 exit(1);
 
-        if ((strcmp(argv[1], "v850") == 0) || (strcmp(argv[1], "h8300") == 0)
+        if ((strcmp(argv[1], "h8300") == 0)
             || (strcmp(argv[1], "blackfin") == 0))
                 printf("#define MODULE_SYMBOL_PREFIX \"_\"\n");
         else
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 508c5895c680..418cd7dbbc93 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -467,6 +467,25 @@ static void parse_elf_finish(struct elf_info *info)
         release_file(info->hdr, info->size);
 }
 
+static int ignore_undef_symbol(struct elf_info *info, const char *symname)
+{
+        /* ignore __this_module, it will be resolved shortly */
+        if (strcmp(symname, MODULE_SYMBOL_PREFIX "__this_module") == 0)
+                return 1;
+        /* ignore global offset table */
+        if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0)
+                return 1;
+        if (info->hdr->e_machine == EM_PPC)
+                /* Special register function linked on all modules during final link of .ko */
+                if (strncmp(symname, "_restgpr_", sizeof("_restgpr_") - 1) == 0 ||
+                    strncmp(symname, "_savegpr_", sizeof("_savegpr_") - 1) == 0 ||
+                    strncmp(symname, "_rest32gpr_", sizeof("_rest32gpr_") - 1) == 0 ||
+                    strncmp(symname, "_save32gpr_", sizeof("_save32gpr_") - 1) == 0)
+                        return 1;
+        /* Do not ignore this symbol */
+        return 0;
+}
+
 #define CRC_PFX     MODULE_SYMBOL_PREFIX "__crc_"
 #define KSYMTAB_PFX MODULE_SYMBOL_PREFIX "__ksymtab_"
 
@@ -493,11 +512,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                 if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL &&
                     ELF_ST_BIND(sym->st_info) != STB_WEAK)
                         break;
-                /* ignore global offset table */
-                if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0)
-                        break;
-                /* ignore __this_module, it will be resolved shortly */
-                if (strcmp(symname, MODULE_SYMBOL_PREFIX "__this_module") == 0)
+                if (ignore_undef_symbol(info, symname))
                         break;
 /* cope with newer glibc (2.3.4 or higher) STT_ definition in elf.h */
 #if defined(STT_REGISTER) || defined(STT_SPARC_REGISTER)
@@ -1453,7 +1468,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
  * marked __initdata will be discarded when the module has been intialized.
  * Likewise for modules used built-in the sections marked __exit
  * are discarded because __exit marked function are supposed to be called
- * only when a moduel is unloaded which never happes for built-in modules.
+ * only when a module is unloaded which never happens for built-in modules.
  * The check_sec_ref() function traverses all relocation records
  * to find all references to a section that reference a section that will
  * be discarded and warns about it.
@@ -1977,7 +1992,8 @@ static void read_markers(const char *fname)
                         mod->skip = 1;
                 }
 
-                add_marker(mod, marker, fmt);
+                if (!mod->skip)
+                        add_marker(mod, marker, fmt);
         }
         return;
 fail: