2 files changed, 32 insertions, 0 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index e26e2fb462d4..f936d1fa969d 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -735,6 +735,27 @@ static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
         return 1;
 }
 
+/*
+ * 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;
+}
+
 /* Looks like: i2c:S */
 static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
                         char *alias)
@@ -994,6 +1015,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct virtio_device_id), "virtio",
                          do_virtio_entry, mod);
+        else if (sym_is(symname, "__mod_vmbus_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct hv_vmbus_device_id), "vmbus",
+                         do_vmbus_entry, mod);
         else if (sym_is(symname, "__mod_i2c_device_table"))
                 do_table(symval, sym->st_size,
                          sizeof(struct i2c_device_id), "i2c",
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index a509ff8f32fa..2bd594e6d1b4 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1849,6 +1849,12 @@ static void add_header(struct buffer *b, struct module *mod)
         buf_printf(b, "};\n");
 }
 
+static void add_intree_flag(struct buffer *b, int is_intree)
+{
+        if (is_intree)
+                buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
+}
+
 static void add_staging_flag(struct buffer *b, const char *name)
 {
         static const char *staging_dir = "drivers/staging";
@@ -2169,6 +2175,7 @@ int main(int argc, char **argv)
                 buf.pos = 0;
 
                 add_header(&buf, mod);
+                add_intree_flag(&buf, !external_module);
                 add_staging_flag(&buf, mod->name);
                 err |= add_versions(&buf, mod);
                 add_depends(&buf, mod, modules);