summaryrefslogtreecommitdiff
path: root/sys/kern/kern_clock.c
diff options
context:
space:
mode:
authorPhilip Guenthe <guenther@cvs.openbsd.org>2012-05-24 07:17:43 +0000
committerPhilip Guenthe <guenther@cvs.openbsd.org>2012-05-24 07:17:43 +0000
commitcf135b70eed2ed8a250008a792e2968e047cb4a0 (patch)
tree7692c64be3563cc5a7985ec9be19d2ef9ba835ef /sys/kern/kern_clock.c
parentf497095ac610c9197a393716ccf3070c40bbf705 (diff)
On resume, run forward the monotonic and realtimes clocks instead of jumping
just the realtime clock, triggering and adjusting timeouts to reflect that. ok matthew@ deraadt@
Diffstat (limited to 'sys/kern/kern_clock.c')
-rw-r--r--sys/kern/kern_clock.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index ab567332f37..c35ff9e95a0 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_clock.c,v 1.73 2012/03/23 15:51:26 guenther Exp $ */
+/* $OpenBSD: kern_clock.c,v 1.74 2012/05/24 07:17:42 guenther Exp $ */
/* $NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $ */
/*-
@@ -129,9 +129,6 @@ void
initclocks(void)
{
int i;
-#ifdef __HAVE_TIMECOUNTER
- extern void inittimecounter(void);
-#endif
softclock_si = softintr_establish(IPL_SOFTCLOCK, softclock, NULL);
if (softclock_si == NULL)