1 files changed, 7 insertions, 0 deletions

diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
index 7f2eed1fc81b..6461a16b4559 100644
--- a/arch/x86/hyperv/hv_init.c
+++ b/arch/x86/hyperv/hv_init.c
@@ -407,6 +407,13 @@ void hyperv_cleanup(void)
         /* Reset our OS id */
         wrmsrl(HV_X64_MSR_GUEST_OS_ID, 0);
 
+        /*
+         * Reset hypercall page reference before reset the page,
+         * let hypercall operations fail safely rather than
+         * panic the kernel for using invalid hypercall page
+         */
+        hv_hypercall_pg = NULL;
+
         /* Reset the hypercall page */
         hypercall_msr.as_uint64 = 0;
         wrmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);