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

diff --git a/ChangeLog b/ChangeLog
index 6cbf04a70ace160e81cf01143f81101aae2c14ff..bc6d68ba30a662d16bbdddeae83afbaed093fab9 100644 (file)
--- 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 775b689e977b2a23862129918bdba6216e1b4369..71bc21b8f0188cab45f946ee92dd0a136794bc54 100644 (file)
--- 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