From 80b865bdc856960faa5ce72dc3c79bfcbcc3839a Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Sun, 15 Dec 2013 17:59:40 +0100 Subject: [PATCH] * grub-core/kern/uboot/init.c: Fix units of uboot timer. --- ChangeLog | 4 ++++ grub-core/kern/uboot/init.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6cbf04a70..bc6d68ba3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-12-15 Ian Campbell + + * grub-core/kern/uboot/init.c: Fix units of uboot timer. + 2013-12-15 Vladimir Serbinenko 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