summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMasao Uebayashi <uebayasi@cvs.openbsd.org>2016-03-20 07:56:09 +0000
committerMasao Uebayashi <uebayasi@cvs.openbsd.org>2016-03-20 07:56:09 +0000
commit5f0fe93df673eb1ba0504840f0d276bcddcea0ad (patch)
tree5cc818dc9f819f925d600e29f8e04c1d7cd46867 /sys
parentab25a4124faa2de6056bc219bb94044a1c697d89 (diff)
Update ticks in hardclock().
OK mikeb@
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/kern_clock.c3
-rw-r--r--sys/kern/kern_timeout.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index adaaab0a73e..c9d596e3769 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_clock.c,v 1.88 2015/06/11 16:03:04 mikeb Exp $ */
+/* $OpenBSD: kern_clock.c,v 1.89 2016/03/20 07:56:08 uebayasi Exp $ */
/* $NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $ */
/*-
@@ -191,6 +191,7 @@ hardclock(struct clockframe *frame)
return;
tc_ticktock();
+ ticks++;
/*
* Update real-time timeout queue.
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index c888cb36286..6ec7db7eff2 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_timeout.c,v 1.44 2016/03/17 10:53:57 uebayasi Exp $ */
+/* $OpenBSD: kern_timeout.c,v 1.45 2016/03/20 07:56:08 uebayasi Exp $ */
/*
* Copyright (c) 2001 Thomas Nordin <nordin@openbsd.org>
* Copyright (c) 2000-2001 Artur Grabowski <art@openbsd.org>
@@ -304,8 +304,6 @@ timeout_hardclock_update(void)
mtx_enter(&timeout_mutex);
- ticks++;
-
MOVEBUCKET(0, ticks);
if (MASKWHEEL(0, ticks) == 0) {
MOVEBUCKET(1, ticks);