1 files changed, 7 insertions, 2 deletions

diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 27c43525a05f..421899f6ad7b 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -526,7 +526,9 @@ static int stimer_set_config(struct kvm_vcpu_hv_stimer *stimer, u64 config,
                 new_config.enable = 0;
         stimer->config.as_uint64 = new_config.as_uint64;
 
-        stimer_mark_pending(stimer, false);
+        if (stimer->config.enable)
+                stimer_mark_pending(stimer, false);
+
         return 0;
 }
 
@@ -542,7 +544,10 @@ static int stimer_set_count(struct kvm_vcpu_hv_stimer *stimer, u64 count,
                 stimer->config.enable = 0;
         else if (stimer->config.auto_enable)
                 stimer->config.enable = 1;
-        stimer_mark_pending(stimer, false);
+
+        if (stimer->config.enable)
+                stimer_mark_pending(stimer, false);
+
         return 0;
 }