From cfbe8a7728e64c8009613a3cfe9267a22975cf53 Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri, 25 Sep 2009 11:09:37 +0200
Subject: [PATCH] --- yaml --- r: 166921 b: refs/heads/master c:
 b2d83cfa3fdefe5c6573d443d099a18dc3a93c5f h: refs/heads/master i:   166919:
 e8f63e86b796e05989beb75fef2b1545fe8c142f v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/kvm/lapic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ee3cb6d9a89b..febe82e2cf82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8feda6f786fc44f5f8b5cf88e3b6c03514f5be93
+refs/heads/master: b2d83cfa3fdefe5c6573d443d099a18dc3a93c5f
diff --git a/trunk/arch/x86/kvm/lapic.c b/trunk/arch/x86/kvm/lapic.c
index 1ae5ceba7eb2..7024224f0fc8 100644
--- a/trunk/arch/x86/kvm/lapic.c
+++ b/trunk/arch/x86/kvm/lapic.c
@@ -664,7 +664,7 @@ static void start_apic_timer(struct kvm_lapic *apic)
 {
 	ktime_t now = apic->lapic_timer.timer.base->get_time();
 
-	apic->lapic_timer.period = apic_get_reg(apic, APIC_TMICT) *
+	apic->lapic_timer.period = (u64)apic_get_reg(apic, APIC_TMICT) *
 		    APIC_BUS_CYCLE_NS * apic->divide_count;
 	atomic_set(&apic->lapic_timer.pending, 0);