Merge with Linux 2.4.0-test9. Please check DECstation, I had a number

of rejects to fixup while integrating Linus patches.  I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages.  I commit this anyway
since I found that the last CVS versions had the same problem.

1 files changed, 0 insertions, 32 deletions

diff --git a/arch/mips64/sgi-ip27/ip27-timer.c b/arch/mips64/sgi-ip27/ip27-timer.c
index 7b4b8ef78..8cbb943c8 100644
--- a/arch/mips64/sgi-ip27/ip27-timer.c
+++ b/arch/mips64/sgi-ip27/ip27-timer.c
@@ -205,38 +205,6 @@ void do_settimeofday(struct timeval *tv)
 #include <asm/sn/sn0/hubio.h>
 #include <asm/pci/bridge.h>
 
-/*
- * Converts Gregorian date to seconds since 1970-01-01 00:00:00.
- * Assumes input in normal date format, i.e. 1980-12-31 23:59:59
- * => year=1980, mon=12, day=31, hour=23, min=59, sec=59.
- *
- * [For the Julian calendar (which was used in Russia before 1917,
- * Britain & colonies before 1752, anywhere else before 1582,
- * and is still in use by some communities) leave out the
- * -year/100+year/400 terms, and add 10.]
- *
- * This algorithm was first published by Gauss (I think).
- *
- * WARNING: this function will overflow on 2106-02-07 06:28:16 on
- * machines were long is 32-bit! (However, as time_t is signed, we
- * will already get problems at other places on 2038-01-19 03:14:08)
- */
-static inline unsigned long mktime(unsigned int year, unsigned int mon,
-        unsigned int day, unsigned int hour,
-        unsigned int min, unsigned int sec)
-{       
-        if (0 >= (int) (mon -= 2)) {    /* 1..12 -> 11,12,1..10 */
-                mon += 12;      /* Puts Feb last since it has leap day */
-                year -= 1;
-        }
-        return (((
-            (unsigned long)(year/4 - year/100 + year/400 + 367*mon/12 + day) +
-              year*365 - 719499
-            )*24 + hour /* now have hours */
-           )*60 + min /* now have minutes */
-          )*60 + sec; /* finally seconds */
-}
-
 static __init unsigned long get_m48t35_time(void)
 {
         unsigned int year, month, date, hour, min, sec;