From fd1bc92bd368899ad61c42878685b9b0fd6f4523 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Mon, 12 Dec 2011 09:29:17 -0800
Subject: [PATCH] --- yaml --- r: 280061 b: refs/heads/master c:
 93e5bd06a95343c701361fa009cdc5a653d6ec8e h: refs/heads/master i:   280059:
 83b8dca32cb1a891e9d127ff9d0fb3516546cf3a v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/hv/channel_mgmt.c | 11 +++++++++++
 trunk/drivers/hv/hv.c           |  3 +++
 trunk/drivers/hv/hyperv_vmbus.h |  1 +
 trunk/drivers/hv/vmbus_drv.c    | 11 +++++++++++
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6db5555b456f..9422ac284881 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b8ee6753154dd6cfe397e0d29fe7f90a8adb50b
+refs/heads/master: 93e5bd06a95343c701361fa009cdc5a653d6ec8e
diff --git a/trunk/drivers/hv/channel_mgmt.c b/trunk/drivers/hv/channel_mgmt.c
index b91af50875e9..36484db36baf 100644
--- a/trunk/drivers/hv/channel_mgmt.c
+++ b/trunk/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/trunk/drivers/hv/hv.c b/trunk/drivers/hv/hv.c
index 0fb100ed91a3..f8a77d01a516 100644
--- a/trunk/drivers/hv/hv.c
+++ b/trunk/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/trunk/drivers/hv/hyperv_vmbus.h b/trunk/drivers/hv/hyperv_vmbus.h
index 0aee1122734c..6d7d286d5440 100644
--- a/trunk/drivers/hv/hyperv_vmbus.h
+++ b/trunk/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/trunk/drivers/hv/vmbus_drv.c b/trunk/drivers/hv/vmbus_drv.c
index 40956d1c6608..c3875f72b5bf 100644
--- a/trunk/drivers/hv/vmbus_drv.c
+++ b/trunk/drivers/hv/vmbus_drv.c
@@ -795,8 +795,19 @@ static int __init hv_acpi_init(void)
 	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);