diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-01 01:26:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-01 01:26:32 +0000 |
| commit | d361b12cce45e1f08b317cffae2d5ccf2644e3f1 (patch) | |
| tree | bf3c49b29c3b45604417b96f8fc74c757ebbb296 /arch/mips/kernel/time.c | |
| parent | 22ee09f3bd26a798e8578522d9c44c75cb3969ac (diff) | |
Fix from Andrea Arcangeli for a potencial division by zero bug when
jiffies wrap.
Diffstat (limited to 'arch/mips/kernel/time.c')
| -rw-r--r-- | arch/mips/kernel/time.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 0f5954039..cab6598db 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -1,4 +1,4 @@ -/* $Id: time.c,v 1.7 1998/08/28 23:29:33 tsbogend Exp $ +/* $Id: time.c,v 1.9 1999/01/04 16:03:49 ralf Exp $ * * Copyright (C) 1991, 1992, 1995 Linus Torvalds * Copyright (C) 1996, 1997, 1998 Ralf Baechle @@ -62,7 +62,7 @@ static unsigned long do_fast_gettimeoffset(void) quotient = cached_quotient; - if (last_jiffies != tmp) { + if (tmp && last_jiffies != tmp) { last_jiffies = tmp; __asm__(".set\tnoreorder\n\t" ".set\tnoat\n\t" @@ -380,6 +380,16 @@ static void r4k_timer_interrupt(int irq, void *dev_id, struct pt_regs * regs) timerlo = count; timer_interrupt(irq, dev_id, regs); + + if (!jiffies) + { + /* + * If jiffies has overflowed in this timer_interrupt we must + * update the timer[hi]/[lo] to make do_fast_gettimeoffset() + * quotient calc still valid. -arca + */ + timerhi = timerlo = 0; + } } /* Converts Gregorian date to seconds since 1970-01-01 00:00:00. |