---

yaml --- r: 117603 b: refs/heads/master c: 18dd36a h: refs/heads/master i: 117601: dfd3249 117599: c8344f0 v: v3
git-mirror · Sep 6, 2008 · 46b89e6 · 46b89e6
1 parent 1d63434
commit 46b89e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)