diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
| commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
| tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /arch/ppc/kernel/time.c | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'arch/ppc/kernel/time.c')
| -rw-r--r-- | arch/ppc/kernel/time.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c index 6be6b90c2..5990dad90 100644 --- a/arch/ppc/kernel/time.c +++ b/arch/ppc/kernel/time.c @@ -126,17 +126,9 @@ void timer_interrupt(struct pt_regs * regs) smp_local_timer_interrupt(regs); #endif -#ifdef CONFIG_APUS - { - extern void apus_heartbeat (void); - apus_heartbeat (); - } -#endif -#if defined(CONFIG_ALL_PPC) || defined(CONFIG_CHRP) - if ( _machine == _MACH_chrp ) - chrp_event_scan(); -#endif - + if ( ppc_md.heartbeat && !ppc_md.heartbeat_count--) + ppc_md.heartbeat(); + hardirq_exit(cpu); } |