From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 28 Mar 2017 20:20:30 +0000 (-0600)
Subject: Revert "hv: don't reset hv_context.tsc_page on crash"
X-Git-Tag: Ubuntu-4.10.0-16.18~160
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a541e7dc82d0ffc1459e8a995ce978c667b8ae80;p=mirror_ubuntu-zesty-kernel.git

Revert "hv: don't reset hv_context.tsc_page on crash"

BugLink: http://bugs.launchpad.net/bugs/1676635

This reverts commit e7a2222fc8a0d23d0e6020f04cccc63ff545f9bf.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 2510dad631ba..055491584df7 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -317,10 +317,9 @@ void hv_cleanup(bool crash)
 
 		hypercall_msr.as_uint64 = 0;
 		wrmsrl(HV_X64_MSR_REFERENCE_TSC, hypercall_msr.as_uint64);
-		if (!crash) {
+		if (!crash)
 			vfree(hv_context.tsc_page);
-			hv_context.tsc_page = NULL;
-		}
+		hv_context.tsc_page = NULL;
 	}
 #endif
 }