Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

[karo-tx-linux.git] / drivers / hv / hv.c

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 0fb100ed91a36a79910b0d7fec72c51ca1aa4264..12aa97f31f935c202d1427539f11fc1a3071f73e 100644 (file)
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -164,11 +164,6 @@ int hv_init(void)
 
        max_leaf = query_hypervisor_info();
 
-       rdmsrl(HV_X64_MSR_GUEST_OS_ID, hv_context.guestid);
-
-       if (hv_context.guestid != 0)
-               goto cleanup;
-
        /* Write our OS info */
        wrmsrl(HV_X64_MSR_GUEST_OS_ID, HV_LINUX_GUEST_ID);
        hv_context.guestid = HV_LINUX_GUEST_ID;
@@ -237,6 +232,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;