From: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Tue, 6 May 2008 14:50:15 +0000 (+0000)
Subject: Fix OMAP1 MPU-timer rate on 32-bit hosts.
X-Git-Tag: xen-3.3.0-rc1~194^2^2~92
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b8b137d6f0aa8e14cce4b5e756e62c2d1fe2e47d;p=qemu-xen-4.0-testing.git

Fix OMAP1 MPU-timer rate on 32-bit hosts.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4360 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/hw/omap1.c b/hw/omap1.c
index f7f2b485..7dab6c8e 100644
--- a/hw/omap1.c
+++ b/hw/omap1.c
@@ -696,7 +696,7 @@ static inline void omap_timer_update(struct omap_mpu_timer_s *timer)
 
     if (timer->enable && timer->st && timer->rate) {
         timer->val = timer->reset_val;	/* Should skip this on clk enable */
-        expires = muldiv64(timer->val << (timer->ptv + 1),
+        expires = muldiv64((uint64_t) timer->val << (timer->ptv + 1),
                         ticks_per_sec, timer->rate);
 
         /* If timer expiry would be sooner than in about 1 ms and