* [PATCH] M68k timekeeping update
@ 2003-03-23 11:26 Geert Uytterhoeven
0 siblings, 0 replies; 2+ messages in thread
From: Geert Uytterhoeven @ 2003-03-23 11:26 UTC (permalink / raw)
To: Marcelo Tosatti, Alan Cox; +Cc: Linux Kernel Development, Geert Uytterhoeven
M68k timekeeping: Do not update the RTC every 11 minutes, since this confuses
NTP (from 2.5.x).
--- linux-2.4.x/arch/m68k/kernel/time.c Thu Jan 4 22:00:55 2001
+++ linux-m68k-2.4.x/arch/m68k/kernel/time.c Tue Mar 4 17:10:38 2003
@@ -55,28 +55,11 @@
*/
static void timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
{
- /* last time the cmos clock got updated */
- static long last_rtc_update=0;
-
do_timer(regs);
if (!user_mode(regs))
do_profile(regs->pc);
- /*
- * If we have an externally synchronized Linux clock, then update
- * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
- * called as close as possible to 500 ms before the new second starts.
- */
- if ((time_status & STA_UNSYNC) == 0 &&
- xtime.tv_sec > last_rtc_update + 660 &&
- xtime.tv_usec >= 500000 - ((unsigned) tick) / 2 &&
- xtime.tv_usec <= 500000 + ((unsigned) tick) / 2) {
- if (set_rtc_mmss(xtime.tv_sec) == 0)
- last_rtc_update = xtime.tv_sec;
- else
- last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */
- }
#ifdef CONFIG_HEARTBEAT
/* use power LED as a heartbeat instead -- much more useful
for debugging -- based on the version for PReP by Cort */
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 2+ messages in thread* [PATCH] M68k timekeeping update
@ 2003-03-19 12:29 Geert Uytterhoeven
0 siblings, 0 replies; 2+ messages in thread
From: Geert Uytterhoeven @ 2003-03-19 12:29 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux Kernel Development, Geert Uytterhoeven
M68k timekeeping: Do not update the RTC every 11 minutes, since this confuses
NTP (the actual code has been commented out since a while).
--- linux-2.5.x/arch/m68k/kernel/time.c Wed Mar 5 10:06:39 2003
+++ linux-m68k-2.5.x/arch/m68k/kernel/time.c Wed Mar 5 10:26:04 2003
@@ -59,35 +59,11 @@
*/
static void timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
{
- /* last time the cmos clock got updated */
- static long last_rtc_update=0;
-
do_timer(regs);
if (!user_mode(regs))
do_profile(regs->pc);
- /*
- * If we have an externally synchronized Linux clock, then update
- * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
- * called as close as possible to 500 ms before the new second starts.
- */
- /*
- * This code hopefully becomes obsolete in 2.5 or earlier
- * Should it ever be reenabled it must be serialized with
- * genrtc.c operation
- */
-#if 0
- if ((time_status & STA_UNSYNC) == 0 &&
- xtime.tv_sec > last_rtc_update + 660 &&
- (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) tick) / 2 &&
- (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) tick) / 2) {
- if (set_rtc_mmss(xtime.tv_sec) == 0)
- last_rtc_update = xtime.tv_sec;
- else
- last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */
- }
-#endif
#ifdef CONFIG_HEARTBEAT
/* use power LED as a heartbeat instead -- much more useful
for debugging -- based on the version for PReP by Cort */
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2003-03-23 11:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-03-23 11:26 [PATCH] M68k timekeeping update Geert Uytterhoeven
-- strict thread matches above, loose matches on Subject: below --
2003-03-19 12:29 Geert Uytterhoeven
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®