2 files changed, 14 insertions, 2 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 4eea60b1693e..a3344285ccf4 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -710,6 +710,14 @@ static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
         strcat(alias, ":");
         return 1;
 }
+
+static int do_platform_entry(const char *filename,
+                             struct platform_device_id *id, char *alias)
+{
+        sprintf(alias, PLATFORM_MODULE_PREFIX "%s", id->name);
+        return 1;
+}
+
 /* Ignore any prefix, eg. some architectures prepend _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -849,6 +857,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 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);
         free(zeros);
 }
 
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 7e62303133dc..8cc70612984c 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1607,12 +1607,12 @@ static void read_symbols(char *modname)
 
         parse_elf_finish(&info);
 
-        /* Our trick to get versioning for struct_module - it's
+        /* Our trick to get versioning for module struct etc. - it's
          * never passed as an argument to an exported function, so
          * the automatic versioning doesn't pick it up, but it's really
          * important anyhow */
         if (modversions)
-                mod->unres = alloc_symbol("struct_module", 0, mod->unres);
+                mod->unres = alloc_symbol("module_layout", 0, mod->unres);
 }
 
 #define SZ 500