patch-2.2.17 linux/arch/ppc/kernel/time.c

• Lines: 31
• Date: Mon Sep 4 18:39:16 2000
• Orig file: v2.2.16/arch/ppc/kernel/time.c
• Orig date: Mon Sep 4 18:37:47 2000

diff -u --recursive --new-file v2.2.16/arch/ppc/kernel/time.c linux/arch/ppc/kernel/time.c
@@ -46,7 +46,7 @@
 #endif
 #include <asm/machdep.h>
 
-#include "time.h"
+#include <asm/time.h>
 
 void smp_local_timer_interrupt(struct pt_regs *);
 
@@ -106,6 +106,13 @@
 		if ( !smp_processor_id() )
 		{
 			do_timer(regs);
+#if 0
+	/* -- BenH -- I'm removing this for now since it can cause various
+	 *            troubles with local-time RTCs. Now that we have a
+	 *            /dev/rtc that uses ppc_md.set_rtc_time() on mac, it
+	 *            should be possible to program the RTC from userland
+	 *            in all cases.
+	 */
 			/*
 			 * update the rtc when needed
 			 */
@@ -119,6 +126,7 @@
 					/* do it again in 60 s */
 					last_rtc_update = xtime.tv_sec;
 			}
+#endif			
 		}
 	}
 #ifdef __SMP__