From 46b89e674b675b64e0b70755569eb8f7c22b8dab Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Mon, 1 Sep 2008 15:19:11 -0700 Subject: [PATCH] --- yaml --- r: 117603 b: refs/heads/master c: 18dd36af0010dd70c8634cdca0f99b47b5036c60 h: refs/heads/master i: 117601: dfd32493b9c9af6bdcc35b4c28ec48ac217aa16d 117599: c8344f0dbb40c08104a25c2e8dcd3e0516829339 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kvm/kvm-ia64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1975ccb59624..680ec6b2b652 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23446d1dc3d4f42a2b0fb82d4a098f9179ba486d +refs/heads/master: 18dd36af0010dd70c8634cdca0f99b47b5036c60 diff --git a/trunk/arch/ia64/kvm/kvm-ia64.c b/trunk/arch/ia64/kvm/kvm-ia64.c index 7a37d06376be..cf8eae1855e6 100644 --- a/trunk/arch/ia64/kvm/kvm-ia64.c +++ b/trunk/arch/ia64/kvm/kvm-ia64.c @@ -1112,7 +1112,7 @@ static void kvm_migrate_hlt_timer(struct kvm_vcpu *vcpu) struct hrtimer *p_ht = &vcpu->arch.hlt_timer; if (hrtimer_cancel(p_ht)) - hrtimer_start(p_ht, p_ht->expires, HRTIMER_MODE_ABS); + hrtimer_start_expires(p_ht, HRTIMER_MODE_ABS); } static enum hrtimer_restart hlt_timer_fn(struct hrtimer *data)