summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett Wollman <wollman@FreeBSD.org>1994-09-29 00:52:06 +0000
committerGarrett Wollman <wollman@FreeBSD.org>1994-09-29 00:52:06 +0000
commit93e010b0fd1c4e43bed7d891ac13aa6a76231c87 (patch)
tree571e39a640bf56977e75ce3fed800f46a8afff1d
parentaf27b9fc77a128ca5a2049216285d6913ecbc110 (diff)
Notes
-rw-r--r--sys/kern/kern_clock.c13
-rw-r--r--sys/kern/kern_tc.c13
-rw-r--r--sys/kern/kern_timeout.c13
3 files changed, 12 insertions, 27 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index d72c2844ab7d2..cb67a902dc580 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.6 1994/09/18 20:39:46 wollman Exp $
+ * $Id: kern_clock.c,v 1.7 1994/09/25 19:33:34 phk Exp $
*/
/* Portions of this software are covered by the following: */
@@ -467,15 +467,10 @@ hardclock(frame)
long ltemp;
if (timedelta == 0) {
- time_update = tick;
+ time_update = tick;
} else {
- if (timedelta < 0) {
- time_update = tick - tickdelta;
- timedelta += tickdelta;
- } else {
- time_update = tick + tickdelta;
- timedelta -= tickdelta;
- }
+ time_update = tick + tickdelta;
+ timedelta -= tickdelta;
}
BUMPTIME(&mono_time, time_update);
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index d72c2844ab7d2..cb67a902dc580 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.6 1994/09/18 20:39:46 wollman Exp $
+ * $Id: kern_clock.c,v 1.7 1994/09/25 19:33:34 phk Exp $
*/
/* Portions of this software are covered by the following: */
@@ -467,15 +467,10 @@ hardclock(frame)
long ltemp;
if (timedelta == 0) {
- time_update = tick;
+ time_update = tick;
} else {
- if (timedelta < 0) {
- time_update = tick - tickdelta;
- timedelta += tickdelta;
- } else {
- time_update = tick + tickdelta;
- timedelta -= tickdelta;
- }
+ time_update = tick + tickdelta;
+ timedelta -= tickdelta;
}
BUMPTIME(&mono_time, time_update);
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index d72c2844ab7d2..cb67a902dc580 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.6 1994/09/18 20:39:46 wollman Exp $
+ * $Id: kern_clock.c,v 1.7 1994/09/25 19:33:34 phk Exp $
*/
/* Portions of this software are covered by the following: */
@@ -467,15 +467,10 @@ hardclock(frame)
long ltemp;
if (timedelta == 0) {
- time_update = tick;
+ time_update = tick;
} else {
- if (timedelta < 0) {
- time_update = tick - tickdelta;
- timedelta += tickdelta;
- } else {
- time_update = tick + tickdelta;
- timedelta -= tickdelta;
- }
+ time_update = tick + tickdelta;
+ timedelta -= tickdelta;
}
BUMPTIME(&mono_time, time_update);