mirror of https://gitee.com/openkylin/linux.git
v850: generic timekeeping conversion
Convert an arch that does not currently implement sub-jiffy timekeeping to use the generic timekeeping code. v850 looks like it has some intent to implement sub-jiffy timekeeping, so it may not yet be appropriate to try to convert, but I figured I'd get the maintainer's input and submit the patch for comment. Signed-off-by: John Stultz <johnstul@us.ibm.com> Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
c2f239d93e
commit
ee17b36fd0
|
@ -37,6 +37,10 @@ config GENERIC_IRQ_PROBE
|
||||||
bool
|
bool
|
||||||
default y
|
default y
|
||||||
|
|
||||||
|
config GENERIC_TIME
|
||||||
|
bool
|
||||||
|
default y
|
||||||
|
|
||||||
config TIME_LOW_RES
|
config TIME_LOW_RES
|
||||||
bool
|
bool
|
||||||
default y
|
default y
|
||||||
|
|
|
@ -90,81 +90,6 @@ static irqreturn_t timer_interrupt (int irq, void *dummy, struct pt_regs *regs)
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* This version of gettimeofday has near microsecond resolution.
|
|
||||||
*/
|
|
||||||
void do_gettimeofday (struct timeval *tv)
|
|
||||||
{
|
|
||||||
#if 0 /* DAVIDM later if possible */
|
|
||||||
extern volatile unsigned long lost_ticks;
|
|
||||||
unsigned long lost;
|
|
||||||
#endif
|
|
||||||
unsigned long flags;
|
|
||||||
unsigned long usec, sec;
|
|
||||||
unsigned long seq;
|
|
||||||
|
|
||||||
do {
|
|
||||||
seq = read_seqbegin_irqsave(&xtime_lock, flags);
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
usec = mach_gettimeoffset ? mach_gettimeoffset () : 0;
|
|
||||||
#else
|
|
||||||
usec = 0;
|
|
||||||
#endif
|
|
||||||
#if 0 /* DAVIDM later if possible */
|
|
||||||
lost = lost_ticks;
|
|
||||||
if (lost)
|
|
||||||
usec += lost * (1000000/HZ);
|
|
||||||
#endif
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
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_nsec
|
|
||||||
* 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!
|
|
||||||
*/
|
|
||||||
#if 0
|
|
||||||
tv->tv_nsec -= mach_gettimeoffset() * 1000;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
while (tv->tv_nsec < 0) {
|
|
||||||
tv->tv_nsec += NSEC_PER_SEC;
|
|
||||||
tv->tv_sec--;
|
|
||||||
}
|
|
||||||
|
|
||||||
xtime.tv_sec = tv->tv_sec;
|
|
||||||
xtime.tv_nsec = tv->tv_nsec;
|
|
||||||
|
|
||||||
ntp_clear();
|
|
||||||
|
|
||||||
write_sequnlock_irq (&xtime_lock);
|
|
||||||
clock_was_set();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
EXPORT_SYMBOL(do_settimeofday);
|
|
||||||
|
|
||||||
static int timer_dev_id;
|
static int timer_dev_id;
|
||||||
static struct irqaction timer_irqaction = {
|
static struct irqaction timer_irqaction = {
|
||||||
timer_interrupt,
|
timer_interrupt,
|
||||||
|
|
Loading…
Reference in New Issue