diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
| commit | f1da2c3860e301527d56a1ef0b56c649ee7c4b1b (patch) | |
| tree | 562b5d2e8b9cb62eb983d78ff6bcf9789e08fcf6 /arch/ppc/kernel/time.c | |
| parent | 00f11569ac8ca73cbcdef8822de1583e79aee571 (diff) | |
Merge with Linux 2.4.0-test5-pre1. This works again on Origin UP.
The IP22 cache bugs which are plaguing some machines are still unfixed.
Diffstat (limited to 'arch/ppc/kernel/time.c')
| -rw-r--r-- | arch/ppc/kernel/time.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c index 3303bf785..aff4838b3 100644 --- a/arch/ppc/kernel/time.c +++ b/arch/ppc/kernel/time.c @@ -44,7 +44,7 @@ #include <asm/8xx_immap.h> #include <asm/machdep.h> -#include "time.h" +#include <asm/time.h> void smp_local_timer_interrupt(struct pt_regs *); @@ -70,7 +70,9 @@ unsigned long last_tb; int timer_interrupt(struct pt_regs * regs) { int dval, d; +#if 0 unsigned long flags; +#endif unsigned long cpu = smp_processor_id(); hardirq_enter(cpu); @@ -120,6 +122,13 @@ int timer_interrupt(struct pt_regs * regs) 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 */ @@ -135,6 +144,7 @@ int timer_interrupt(struct pt_regs * regs) last_rtc_update = xtime.tv_sec; } read_unlock_irqrestore(&xtime_lock, flags); +#endif } #ifdef CONFIG_SMP smp_local_timer_interrupt(regs); |