[patch] 2.6: More time fixes: do_gettimeofday() & do_settimeofday()

["Maciej W. Rozycki" <macro@ds2.pg.gda.pl>]

Hello,

 Here is the respective update for the trunk.  OK?

 I think the code in the trunk and in the 2.4 branch can be further
unified.  Removing syntactic inconsistencies will lead to easier
cross-version maintenance.

  Maciej

-- 
+  Maciej W. Rozycki, Technical University of Gdansk, Poland   +
+--------------------------------------------------------------+
+        e-mail: macro@ds2.pg.gda.pl, PGP key available        +

patch-mips-2.6.0-test2-20030804-mips-timeofday-1
diff -up --recursive --new-file 
linux-mips-2.6.0-test2-20030804.macro/arch/mips/kernel/time.c 
linux-mips-2.6.0-test2-20030804/arch/mips/kernel/time.c
--- linux-mips-2.6.0-test2-20030804.macro/arch/mips/kernel/time.c       Thu Jul 
31 14:54:57 2003
+++ linux-mips-2.6.0-test2-20030804/arch/mips/kernel/time.c     Mon Aug  4 
15:28:28 2003
@@ -18,6 +18,7 @@
 #include <linux/sched.h>
 #include <linux/param.h>
 #include <linux/time.h>
+#include <linux/timex.h>
 #include <linux/smp.h>
 #include <linux/kernel_stat.h>
 #include <linux/spinlock.h>
@@ -76,18 +77,21 @@ int (*rtc_set_mmss)(unsigned long);
 void do_gettimeofday(struct timeval *tv)
 {
        unsigned long seq;
+       unsigned long lost;
        unsigned long usec, sec;
 
        do {
                seq = read_seqbegin(&xtime_lock);
+
                usec = do_gettimeoffset();
-               {
-                       unsigned long lost = jiffies - wall_jiffies;
-                       if (lost)
-                               usec += lost * (1000000 / HZ);
-               }
+
+               lost = jiffies - wall_jiffies;
+               if (lost)
+                       usec += lost * TICK_SIZE;
+
                sec = xtime.tv_sec;
                usec += (xtime.tv_nsec / 1000);
+
        } while (read_seqretry(&xtime_lock, seq));
 
        while (usec >= 1000000) {
@@ -108,14 +112,15 @@ int do_settimeofday(struct timespec *tv)
                return -EINVAL;
 
        write_seqlock_irq(&xtime_lock);
+
        /*
-        * This is revolting. We need to set "xtime" correctly. However, the
-        * value in this location is the value at the most recent update of
-        * wall time.  Discover what correction gettimeofday() would have
+        * This is revolting.  We need to set "xtime" correctly.  However,
+        * the value in this location is the value at the most recent update
+        * of wall time.  Discover what correction gettimeofday() would have
         * made, and then undo it!
         */
        nsec -= do_gettimeoffset() * NSEC_PER_USEC;
-       nsec -= (jiffies - wall_jiffies) * TICK_NSEC;
+       nsec -= (jiffies - wall_jiffies) * tick_nsec;
 
        wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
        wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
@@ -123,10 +128,11 @@ int do_settimeofday(struct timespec *tv)
        set_normalized_timespec(&xtime, sec, nsec);
        set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-       time_adjust = 0;                /* stop active adjtime() */
+       time_adjust = 0;                        /* stop active adjtime() */
        time_status |= STA_UNSYNC;
        time_maxerror = NTP_PHASE_LIMIT;
        time_esterror = NTP_PHASE_LIMIT;
+
        write_sequnlock_irq(&xtime_lock);
 
        return 0;