1 files changed, 7 insertions, 2 deletions

diff --git a/arch/ia64/kvm/kvm_fw.c b/arch/ia64/kvm/kvm_fw.c
index 0c69d9ec92d4..cb7600bdff9d 100644
--- a/arch/ia64/kvm/kvm_fw.c
+++ b/arch/ia64/kvm/kvm_fw.c
@@ -286,6 +286,12 @@ static  u64 kvm_get_pal_call_index(struct kvm_vcpu *vcpu)
         return index;
 }
 
+static void prepare_for_halt(struct kvm_vcpu *vcpu)
+{
+        vcpu->arch.timer_pending = 1;
+        vcpu->arch.timer_fired = 0;
+}
+
 int kvm_pal_emul(struct kvm_vcpu *vcpu, struct kvm_run *run)
 {
 
@@ -304,11 +310,10 @@ int kvm_pal_emul(struct kvm_vcpu *vcpu, struct kvm_run *run)
                 break;
         case PAL_HALT_LIGHT:
         {
-                vcpu->arch.timer_pending = 1;
                 INIT_PAL_STATUS_SUCCESS(result);
+                prepare_for_halt(vcpu);
                 if (kvm_highest_pending_irq(vcpu) == -1)
                         ret = kvm_emulate_halt(vcpu);
-
         }
                 break;