diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
| commit | 9e30c3705aed9fbec4c3304570e4d6e707856bcb (patch) | |
| tree | b19e6acb5a67af31a4e7742e05c2166dc3f1444c /arch/mips/sgi | |
| parent | 72919904796333a20c6a5d5c380091b42e407aa9 (diff) | |
Merge with Linux 2.3.22.
Diffstat (limited to 'arch/mips/sgi')
| -rw-r--r-- | arch/mips/sgi/kernel/indy_timer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/sgi/kernel/indy_timer.c b/arch/mips/sgi/kernel/indy_timer.c index 0b388bf32..00c1c3c68 100644 --- a/arch/mips/sgi/kernel/indy_timer.c +++ b/arch/mips/sgi/kernel/indy_timer.c @@ -1,4 +1,4 @@ -/* $Id: indy_timer.c,v 1.15 1999/10/21 00:23:05 ralf Exp $ +/* $Id: indy_timer.c,v 1.16 2000/01/17 23:32:46 ralf Exp $ * * indy_timer.c: Setting up the clock on the INDY 8254 controller. * @@ -33,6 +33,8 @@ static unsigned long r4k_offset; /* Amount to increment compare reg each time */ static unsigned long r4k_cur; /* What counter should be at next timer irq */ +extern rwlock_t xtime_lock; + static inline void ack_r4ktimer(unsigned long newval) { write_32bit_cp0_register(CP0_COMPARE, newval); |