From fab8249e23e33d2dccce4d67cf895dbfbd79e733 Mon Sep 17 00:00:00 2001
From: wollman <wollman@FreeBSD.org>
Date: Thu, 12 Oct 1995 20:35:01 +0000
Subject: [PATCH] Improve clock accuracy by accounting for late/missed clock
 interrupts if the hardware supports it.

---
 sys/kern/kern_clock.c   | 6 +++---
 sys/kern/kern_tc.c      | 6 +++---
 sys/kern/kern_timeout.c | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index ede7b6d261b6..1b617fadda3f 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.15 1995/08/28 09:18:43 julian Exp $
+ * $Id: kern_clock.c,v 1.16 1995/09/09 18:10:01 davidg Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -477,9 +477,9 @@ hardclock(frame)
 		long ltemp;
 
 		if (timedelta == 0) {
-			time_update = tick;
+			time_update = CPU_THISTICKLEN(tick);
 		} else {
-			time_update = tick + tickdelta;
+			time_update = CPU_THISTICKLEN(tick) + tickdelta;
 			timedelta -= tickdelta;
 		}
 		BUMPTIME(&mono_time, time_update);
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index ede7b6d261b6..1b617fadda3f 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.15 1995/08/28 09:18:43 julian Exp $
+ * $Id: kern_clock.c,v 1.16 1995/09/09 18:10:01 davidg Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -477,9 +477,9 @@ hardclock(frame)
 		long ltemp;
 
 		if (timedelta == 0) {
-			time_update = tick;
+			time_update = CPU_THISTICKLEN(tick);
 		} else {
-			time_update = tick + tickdelta;
+			time_update = CPU_THISTICKLEN(tick) + tickdelta;
 			timedelta -= tickdelta;
 		}
 		BUMPTIME(&mono_time, time_update);
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index ede7b6d261b6..1b617fadda3f 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.15 1995/08/28 09:18:43 julian Exp $
+ * $Id: kern_clock.c,v 1.16 1995/09/09 18:10:01 davidg Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -477,9 +477,9 @@ hardclock(frame)
 		long ltemp;
 
 		if (timedelta == 0) {
-			time_update = tick;
+			time_update = CPU_THISTICKLEN(tick);
 		} else {
-			time_update = tick + tickdelta;
+			time_update = CPU_THISTICKLEN(tick) + tickdelta;
 			timedelta -= tickdelta;
 		}
 		BUMPTIME(&mono_time, time_update);