--- time.c.orig	Fri Nov  7 13:06:21 1997
+++ linux/arch/i386/kernel/time.c	Thu May 14 16:03:02 1998
@@ -43,6 +47,9 @@
 	unsigned long high;
 } init_timer_cc, last_timer_cc;
 
+/* Number of usecs that the last interrupt was delayed */
+static int delay_at_last_interrupt;
+
 /*
  * This is more assembly than C, but it's also rather
  * timing-critical and we have to use assembler to get
@@ -129,10 +136,16 @@
 	 * we need to check the result so that we'll get a timer
 	 * that is monotonic.
 	 */
-	if (edx >= 1000020/HZ)
-		edx = 1000020/HZ-1;
+        /* 
+         * Monotonic times should be enforced in gettimeofday,
+         * and it is not the case that the error is limited to
+         * one tick. 
+         *
+	 * if (edx >= 1000020/HZ)
+         * 	edx = 1000020/HZ-1;
+         */
 
-	eax = edx + missing_time;
+	eax = edx + missing_time + delay_at_last_interrupt;
 	return eax;
 }
 #endif
@@ -234,6 +247,28 @@
 	return offset + count;
 }
 
+static unsigned long do_both_gettimeoffset(void)
+{
+       unsigned long slow, fast;
+       static int fast_after_slow;
+       static int slow_after_fast = 5;
+
+       fast = do_fast_gettimeoffset();
+       slow = do_slow_gettimeoffset();
+
+       if (slow + fast_after_slow < fast) {
+           fast_after_slow = fast - slow;
+           printk(KERN_WARNING "do_fast_gettimeoffset()=%ld - do_slow_gettimeoffset()=%ld = %d\n", fast, slow, fast_after_slow);
+       }
+
+       if (fast + slow_after_fast < slow) {
+           slow_after_fast = slow - fast;
+           printk(KERN_WARNING "do_fast_gettimeoffset()=%ld - do_slow_gettimeoffset()=%ld = %d\n", fast, slow, -slow_after_fast);
+       }
+
+       return fast;
+}
+
 static unsigned long (*do_gettimeoffset)(void) = do_slow_gettimeoffset;
 
 /*
@@ -385,10 +471,24 @@
  */
 static void pentium_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
+        int count;
+
+        /* It is important that these two operations happen at the
+         * same time. It is unclear which order is better!
+         */
+
+	outb_p(0x00, 0x43);	/* latch the count ASAP */
 	/* read Pentium cycle counter */
 	__asm__(".byte 0x0f,0x31"
 		:"=a" (last_timer_cc.low),
 		 "=d" (last_timer_cc.high));
+
+	count = inb_p(0x40);	/* read the latched count */
+	count |= inb(0x40) << 8;
+
+	count = ((LATCH-1) - count) * TICK_SIZE;
+	delay_at_last_interrupt = (count + LATCH/2) / LATCH;
+
 	timer_interrupt(irq, NULL, regs);
 }
 #endif
--- linux/kernel/time.c.old	Tue Nov 11 15:51:14 1997
+++ linux/kernel/time.c	Tue Nov 11 15:52:11 1997
@@ -68,23 +68,17 @@
  */
 asmlinkage int sys_stime(int * tptr)
 {
-	int error, value;
+	int error;
+	struct timeval new_tv;
 
 	if (!suser())
 		return -EPERM;
 	error = verify_area(VERIFY_READ, tptr, sizeof(*tptr));
 	if (error)
 		return error;
-	value = get_user(tptr);
-	cli();
-	xtime.tv_sec = value;
-	xtime.tv_usec = 0;
-	time_adjust = 0;	/* stop active adjtime() */
-	time_status |= STA_UNSYNC;
-	time_state = TIME_ERROR;	/* p. 24, (a) */
-	time_maxerror = NTP_PHASE_LIMIT;
-	time_esterror = NTP_PHASE_LIMIT;
-	sti();
+	new_tv.tv_sec = get_user(tptr);
+	new_tv.tv_usec = 0;
+	do_settimeofday(&new_tv);
 	return 0;
 }