forked from Minki/linux
m68knommu: remove local gettimeofday code
Remove unused local gettimeofday functions, now that we are using GENERIC_TIME. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
de0cc4e283
commit
2d8815ba82
@ -88,60 +88,3 @@ void time_init(void)
|
|||||||
hw_timer_init();
|
hw_timer_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* This version of gettimeofday has near microsecond resolution.
|
|
||||||
*/
|
|
||||||
void do_gettimeofday(struct timeval *tv)
|
|
||||||
{
|
|
||||||
unsigned long flags;
|
|
||||||
unsigned long seq;
|
|
||||||
unsigned long usec, sec;
|
|
||||||
|
|
||||||
do {
|
|
||||||
seq = read_seqbegin_irqsave(&xtime_lock, flags);
|
|
||||||
usec = hw_timer_offset();
|
|
||||||
sec = xtime.tv_sec;
|
|
||||||
usec += (xtime.tv_nsec / 1000);
|
|
||||||
} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
|
|
||||||
|
|
||||||
while (usec >= 1000000) {
|
|
||||||
usec -= 1000000;
|
|
||||||
sec++;
|
|
||||||
}
|
|
||||||
|
|
||||||
tv->tv_sec = sec;
|
|
||||||
tv->tv_usec = usec;
|
|
||||||
}
|
|
||||||
|
|
||||||
EXPORT_SYMBOL(do_gettimeofday);
|
|
||||||
|
|
||||||
int do_settimeofday(struct timespec *tv)
|
|
||||||
{
|
|
||||||
time_t wtm_sec, sec = tv->tv_sec;
|
|
||||||
long wtm_nsec, nsec = tv->tv_nsec;
|
|
||||||
|
|
||||||
if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
write_seqlock_irq(&xtime_lock);
|
|
||||||
/*
|
|
||||||
* This is revolting. We need to set the xtime.tv_usec
|
|
||||||
* correctly. However, the value in this location is
|
|
||||||
* is value at the last tick.
|
|
||||||
* Discover what correction gettimeofday
|
|
||||||
* would have done, and then undo it!
|
|
||||||
*/
|
|
||||||
nsec -= (hw_timer_offset() * 1000);
|
|
||||||
|
|
||||||
wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
|
|
||||||
wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
|
|
||||||
|
|
||||||
set_normalized_timespec(&xtime, sec, nsec);
|
|
||||||
set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
|
|
||||||
|
|
||||||
ntp_clear();
|
|
||||||
write_sequnlock_irq(&xtime_lock);
|
|
||||||
clock_was_set();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(do_settimeofday);
|
|
||||||
|
Loading…
Reference in New Issue
Block a user