2 files changed, 32 insertions, 5 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index cea4a790e1e9..37d5c363fbcd 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)
@@ -680,6 +688,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",
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 508c5895c680..a07f91aac920 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)