diff --git a/ChangeLog b/ChangeLog index c1e9fbfec..323c2a0da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-10-08 Vladimir Serbinenko + + * grub-core/kern/emu/misc.c (grub_get_rtc): Remove (it's a leftover). + 2013-10-08 Vladimir Serbinenko * grub-core/net/drivers/emu/emunet.c: Move to .. diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c index fe9673247..e68731c2f 100644 --- a/grub-core/kern/emu/misc.c +++ b/grub-core/kern/emu/misc.c @@ -29,9 +29,6 @@ #include #include #include -#ifdef HAVE_LIMITS_H -#include -#endif #include #include @@ -156,18 +153,6 @@ grub_get_time_ms (void) return (tv.tv_sec * 1000 + tv.tv_usec / 1000); } -grub_uint32_t -grub_get_rtc (void) -{ - struct timeval tv; - - gettimeofday (&tv, 0); - - return (tv.tv_sec * GRUB_TICKS_PER_SECOND - + (((tv.tv_sec % GRUB_TICKS_PER_SECOND) * 1000000 + tv.tv_usec) - * GRUB_TICKS_PER_SECOND / 1000000)); -} - #ifdef __MINGW32__ int fsync (int fno __attribute__ ((unused))) diff --git a/include/grub/time.h b/include/grub/time.h index e834796e2..949452680 100644 --- a/include/grub/time.h +++ b/include/grub/time.h @@ -23,12 +23,6 @@ #include #include -#if defined (GRUB_MACHINE_EMU) || defined (GRUB_UTIL) -#define GRUB_TICKS_PER_SECOND 100000 -/* Return the real time in ticks. */ -grub_uint32_t EXPORT_FUNC (grub_get_rtc) (void); -#endif - void EXPORT_FUNC(grub_millisleep) (grub_uint32_t ms); grub_uint64_t EXPORT_FUNC(grub_get_time_ms) (void);