aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid Hildenbrand <dahi@linux.vnet.ibm.com>2014-12-12 09:17:31 -0500
committerChristian Borntraeger <borntraeger@de.ibm.com>2015-01-23 07:25:32 -0500
commit0ac96caf0f9381088c673a16d910b1d329670edf (patch)
treeb6b64cf389c7ffa37efb6b7e59bdbba0bdc8ef64 /arch
parentbda343ef149bc0ce01ec965c74d464849bde96d8 (diff)
KVM: s390: base hrtimer on a monotonic clock
The hrtimer that handles the wait with enabled timer interrupts should not be disturbed by changes of the host time. This patch changes our hrtimer to be based on a monotonic clock. Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Cc: stable@vger.kernel.org Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/kvm/kvm-s390.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 14cdf1c3b995..37ef06c19c31 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -735,7 +735,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
735 if (rc) 735 if (rc)
736 return rc; 736 return rc;
737 } 737 }
738 hrtimer_init(&vcpu->arch.ckc_timer, CLOCK_REALTIME, HRTIMER_MODE_ABS); 738 hrtimer_init(&vcpu->arch.ckc_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
739 vcpu->arch.ckc_timer.function = kvm_s390_idle_wakeup; 739 vcpu->arch.ckc_timer.function = kvm_s390_idle_wakeup;
740 get_cpu_id(&vcpu->arch.cpu_id); 740 get_cpu_id(&vcpu->arch.cpu_id);
741 vcpu->arch.cpu_id.version = 0xff; 741 vcpu->arch.cpu_id.version = 0xff;