diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-12 01:43:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-12 01:43:08 +0000 |
| commit | f4ae78d536e6dfaeb24c01b331fc38d950ed062b (patch) | |
| tree | 6930a78aa7cc4ee1829d50d3bcbaf0dbe9e2e905 /arch/alpha/kernel | |
| parent | 66f20d0f9bd86dc11f3869d78f3c5749789323ee (diff) | |
Merge with 2.4.0-test4-pre2.
Diffstat (limited to 'arch/alpha/kernel')
| -rw-r--r-- | arch/alpha/kernel/sys_nautilus.c | 5 | ||||
| -rw-r--r-- | arch/alpha/kernel/time.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c index 32653e3a7..2115b8d2c 100644 --- a/arch/alpha/kernel/sys_nautilus.c +++ b/arch/alpha/kernel/sys_nautilus.c @@ -53,6 +53,11 @@ static void __init nautilus_init_irq(void) { + if (alpha_using_srm) { + alpha_mv.device_interrupt = srm_device_interrupt; + alpha_mv.kill_arch = NULL; + } + init_i8259a_irqs(); common_init_isa_dma(); } diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c index 8cac7f240..d4ad98651 100644 --- a/arch/alpha/kernel/time.c +++ b/arch/alpha/kernel/time.c @@ -45,7 +45,7 @@ #include "irq_impl.h" extern rwlock_t xtime_lock; -extern volatile unsigned long lost_ticks; /* kernel/sched.c */ +extern unsigned long wall_jiffies; /* kernel/timer.c */ static int set_rtc_mmss(unsigned long); @@ -312,7 +312,7 @@ do_gettimeofday(struct timeval *tv) sec = xtime.tv_sec; usec = xtime.tv_usec; partial_tick = state.partial_tick; - lost = lost_ticks; + lost = jiffies - wall_jiffies; read_unlock_irqrestore(&xtime_lock, flags); @@ -363,12 +363,12 @@ do_settimeofday(struct timeval *tv) time. Without this, a full-tick error is possible. */ #ifdef CONFIG_SMP - delta_usec = lost_ticks * (1000000 / HZ); + delta_usec = (jiffies - wall_jiffies) * (1000000 / HZ); #else delta_usec = rpcc() - state.last_time; delta_usec = (delta_usec * state.scaled_ticks_per_cycle + state.partial_tick - + (lost_ticks << FIX_SHIFT)) * 15625; + + ((jiffies - wall_jiffies) << FIX_SHIFT)) * 15625; delta_usec = ((delta_usec / ((1UL << (FIX_SHIFT-6-1)) * HZ)) + 1) / 2; #endif |