4 files changed, 26 insertions, 0 deletions

diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index b91af50875e9..36484db36baf 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -223,6 +223,17 @@ static void vmbus_process_rescind_offer(struct work_struct *work)
         vmbus_device_unregister(channel->device_obj);
 }
 
+void vmbus_free_channels(void)
+{
+        struct vmbus_channel *channel;
+
+        list_for_each_entry(channel, &vmbus_connection.chn_list, listentry) {
+                vmbus_device_unregister(channel->device_obj);
+                kfree(channel->device_obj);
+                free_channel(channel);
+        }
+}
+
 /*
  * vmbus_process_offer - Process the offer by creating a channel/device
  * associated with this offer
diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 0fb100ed91a3..f8a77d01a516 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -237,6 +237,9 @@ void hv_cleanup(void)
 {
         union hv_x64_msr_hypercall_contents hypercall_msr;
 
+        /* Reset our OS id */
+        wrmsrl(HV_X64_MSR_GUEST_OS_ID, 0);
+
         kfree(hv_context.signal_event_buffer);
         hv_context.signal_event_buffer = NULL;
         hv_context.signal_event_param = NULL;
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
index 0aee1122734c..6d7d286d5440 100644
--- a/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
@@ -611,6 +611,7 @@ void vmbus_device_unregister(struct hv_device *device_obj);
 
 struct vmbus_channel *relid2channel(u32 relid);
 
+void vmbus_free_channels(void);
 
 /* Connection interface */
 
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 40956d1c6608..c3875f72b5bf 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -795,8 +795,19 @@ cleanup:
         return ret;
 }
 
+static void __exit vmbus_exit(void)
+{
+
+        free_irq(irq, hv_acpi_dev);
+        vmbus_free_channels();
+        bus_unregister(&hv_bus);
+        hv_cleanup();
+        acpi_bus_unregister_driver(&vmbus_acpi_driver);
+}
+
 
 MODULE_LICENSE("GPL");
 MODULE_VERSION(HV_DRV_VERSION);
 
 subsys_initcall(hv_acpi_init);
+module_exit(vmbus_exit);