m68knommu: move code within time.c
This patch creates two functions do_set_rtc() and read_rtc_mmss() based on allready available code. Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
This commit is contained in:
parent
1fda83d83c
commit
0df185f5a1
arch/m68knommu/kernel
|
@ -33,22 +33,11 @@ static inline int set_rtc_mmss(unsigned long nowtime)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
static inline void do_set_rtc(void)
|
||||||
* timer_interrupt() needs to keep up the real-time clock,
|
|
||||||
* as well as call the "do_timer()" routine every clocktick
|
|
||||||
*/
|
|
||||||
irqreturn_t arch_timer_interrupt(int irq, void *dummy)
|
|
||||||
{
|
{
|
||||||
/* last time the cmos clock got updated */
|
/* last time the cmos clock got updated */
|
||||||
static long last_rtc_update=0;
|
static long last_rtc_update=0;
|
||||||
|
|
||||||
if (current->pid)
|
|
||||||
profile_tick(CPU_PROFILING);
|
|
||||||
|
|
||||||
write_seqlock(&xtime_lock);
|
|
||||||
|
|
||||||
do_timer(1);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If we have an externally synchronized Linux clock, then update
|
* If we have an externally synchronized Linux clock, then update
|
||||||
* CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
|
* CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
|
||||||
|
@ -63,6 +52,23 @@ irqreturn_t arch_timer_interrupt(int irq, void *dummy)
|
||||||
else
|
else
|
||||||
last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */
|
last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* timer_interrupt() needs to keep up the real-time clock,
|
||||||
|
* as well as call the "do_timer()" routine every clocktick
|
||||||
|
*/
|
||||||
|
irqreturn_t arch_timer_interrupt(int irq, void *dummy)
|
||||||
|
{
|
||||||
|
|
||||||
|
if (current->pid)
|
||||||
|
profile_tick(CPU_PROFILING);
|
||||||
|
|
||||||
|
write_seqlock(&xtime_lock);
|
||||||
|
|
||||||
|
do_timer(1);
|
||||||
|
|
||||||
|
do_set_rtc();
|
||||||
|
|
||||||
write_sequnlock(&xtime_lock);
|
write_sequnlock(&xtime_lock);
|
||||||
|
|
||||||
|
@ -72,7 +78,7 @@ irqreturn_t arch_timer_interrupt(int irq, void *dummy)
|
||||||
return(IRQ_HANDLED);
|
return(IRQ_HANDLED);
|
||||||
}
|
}
|
||||||
|
|
||||||
void time_init(void)
|
static unsigned long read_rtc_mmss(void)
|
||||||
{
|
{
|
||||||
unsigned int year, mon, day, hour, min, sec;
|
unsigned int year, mon, day, hour, min, sec;
|
||||||
|
|
||||||
|
@ -83,7 +89,13 @@ void time_init(void)
|
||||||
|
|
||||||
if ((year += 1900) < 1970)
|
if ((year += 1900) < 1970)
|
||||||
year += 100;
|
year += 100;
|
||||||
xtime.tv_sec = mktime(year, mon, day, hour, min, sec);
|
|
||||||
|
return mktime(year, mon, day, hour, min, sec);;
|
||||||
|
}
|
||||||
|
|
||||||
|
void time_init(void)
|
||||||
|
{
|
||||||
|
xtime.tv_sec = read_rtc_mmss();
|
||||||
xtime.tv_nsec = 0;
|
xtime.tv_nsec = 0;
|
||||||
wall_to_monotonic.tv_sec = -xtime.tv_sec;
|
wall_to_monotonic.tv_sec = -xtime.tv_sec;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue