diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /arch/ppc/kernel/time.c | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'arch/ppc/kernel/time.c')
| -rw-r--r-- | arch/ppc/kernel/time.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c index 6f0eb798b..6be6b90c2 100644 --- a/arch/ppc/kernel/time.c +++ b/arch/ppc/kernel/time.c @@ -1,5 +1,5 @@ /* - * $Id: time.c,v 1.47 1999/03/18 05:11:11 cort Exp $ + * $Id: time.c,v 1.48 1999/05/22 19:35:57 cort Exp $ * Common time routines among all ppc machines. * * Written by Cort Dougan (cort@cs.nmt.edu) to merge @@ -126,13 +126,17 @@ void timer_interrupt(struct pt_regs * regs) smp_local_timer_interrupt(regs); #endif - /* Fixme - make this more generic - Corey */ #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 + hardirq_exit(cpu); } |