From: Ian Campbell <ijc@hellion.org.uk>
Date: Sun, 15 Dec 2013 16:59:40 +0000 (+0100)
Subject: 	* grub-core/kern/uboot/init.c: Fix units of uboot timer.
X-Git-Tag: grub-2.02-beta1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80b865bdc856960faa5ce72dc3c79bfcbcc3839a;p=thirdparty%2Fgrub.git

	* grub-core/kern/uboot/init.c: Fix units of uboot timer.
---

diff --git a/ChangeLog b/ChangeLog
index 6cbf04a70..bc6d68ba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-15  Ian Campbell  <ijc@hellion.org.uk>
+
+	* grub-core/kern/uboot/init.c: Fix units of uboot timer.
+
 2013-12-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	New functional test for sleep function.
diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
index 775b689e9..71bc21b8f 100644
--- a/grub-core/kern/uboot/init.c
+++ b/grub-core/kern/uboot/init.c
@@ -66,8 +66,7 @@ uboot_timer_ms (void)
   if (cur < last)
     high++;
   last = cur;
-  return grub_divmod64 ((((grub_uint64_t) high) << 32) | cur,
-			1000, 0);
+  return (((grub_uint64_t) high) << 32) | cur;
 }
 
 void