summaryrefslogtreecommitdiff
path: root/sys/kern/kern_clock.c
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2004-08-04 16:29:33 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2004-08-04 16:29:33 +0000
commit836d9315948e75e2ed949da12263b306578a76e3 (patch)
treeeac82f60c66434f72dbaf51134828ca903e5ae14 /sys/kern/kern_clock.c
parent8e5c95ca589305fb7c06ab20f042108bd1f47102 (diff)
Even when we have timecounters we still have to do the check for secondary
cpus calling hardclock and the statclock emulation. Move some ifdef __HAVE_TIMECOUNTER code.
Diffstat (limited to 'sys/kern/kern_clock.c')
-rw-r--r--sys/kern/kern_clock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 9d79ae260fc..b7fcfa717c5 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_clock.c,v 1.47 2004/07/28 17:15:12 tholo Exp $ */
+/* $OpenBSD: kern_clock.c,v 1.48 2004/08/04 16:29:32 art Exp $ */
/* $NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $ */
/*-
@@ -181,10 +181,10 @@ hardclock(struct clockframe *frame)
int delta;
extern int tickdelta;
extern long timedelta;
+#endif
#ifdef __HAVE_CPUINFO
struct cpu_info *ci = curcpu();
#endif
-#endif
p = curproc;
if (p) {
@@ -203,7 +203,6 @@ hardclock(struct clockframe *frame)
psignal(p, SIGPROF);
}
-#ifndef __HAVE_TIMECOUNTER
/*
* If no separate statistics clock is available, run it from here.
*/
@@ -222,6 +221,7 @@ hardclock(struct clockframe *frame)
return;
#endif
+#ifndef __HAVE_TIMECOUNTER
/*
* Increment the time-of-day. The increment is normally just
* ``tick''. If the machine is one which has a clock frequency