aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-09-01 18:19:11 -0400
committerArjan van de Ven <arjan@linux.intel.com>2008-09-06 00:35:19 -0400
commit18dd36af0010dd70c8634cdca0f99b47b5036c60 (patch)
treee6989ec3361023f16896bd1984747f80acc06ca0 /arch
parent23446d1dc3d4f42a2b0fb82d4a098f9179ba486d (diff)
hrtimer: convert kvm-ia64 to the new hrtimer apis
In order to be able to do range hrtimers we need to use accessor functions to the "expire" member of the hrtimer struct. This patch converts KVM-ia64 to these accessors. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/kvm/kvm-ia64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 7a37d06376be..cf8eae1855e6 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -1112,7 +1112,7 @@ static void kvm_migrate_hlt_timer(struct kvm_vcpu *vcpu)
1112 struct hrtimer *p_ht = &vcpu->arch.hlt_timer; 1112 struct hrtimer *p_ht = &vcpu->arch.hlt_timer;
1113 1113
1114 if (hrtimer_cancel(p_ht)) 1114 if (hrtimer_cancel(p_ht))
1115 hrtimer_start(p_ht, p_ht->expires, HRTIMER_MODE_ABS); 1115 hrtimer_start_expires(p_ht, HRTIMER_MODE_ABS);
1116} 1116}
1117 1117
1118static enum hrtimer_restart hlt_timer_fn(struct hrtimer *data) 1118static enum hrtimer_restart hlt_timer_fn(struct hrtimer *data)