summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_clock.c
diff options
context:
space:
mode:
authorgrange <grange@openbsd.org>2004-11-10 11:00:00 +0000
committergrange <grange@openbsd.org>2004-11-10 11:00:00 +0000
commitc51873d0fcd05215b74a2667e7d56387e6ccf96a (patch)
tree07a8d41dc71db1388cf8fe06ead168aacbc539c6 /sys/kern/kern_clock.c
parentRemove __cplusplus crud. (diff)
downloadwireguard-openbsd-c51873d0fcd05215b74a2667e7d56387e6ccf96a.tar.xz
wireguard-openbsd-c51873d0fcd05215b74a2667e7d56387e6ccf96a.zip
Diff from art@:
Update ticks in timeout_hardclock_update to avoid errors in hardclock (this is the third time we mess up here). ticks is only used for timeouts anyway. At the same protect updating ticks with timeout_mutex and be slightly more paranoid in timeout_hardclock_update. ok tdeval@ miod@
Diffstat (limited to 'sys/kern/kern_clock.c')
-rw-r--r--sys/kern/kern_clock.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index c7873d167cf..d5bc91a5918 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_clock.c,v 1.51 2004/09/15 17:48:52 grange Exp $ */
+/* $OpenBSD: kern_clock.c,v 1.52 2004/11/10 11:00:00 grange Exp $ */
/* $NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $ */
/*-
@@ -271,7 +271,6 @@ hardclock(struct clockframe *frame)
* if we are still adjusting the time (see adjtime()),
* ``tickdelta'' may also be added in.
*/
- ticks++;
delta = tick;