summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2016-01-19 17:57:08 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2016-01-19 17:57:08 +0000
commitc38fe6297773662a9ac3294917d04ca229e9518f (patch)
tree4879f8c43446d3c64182da904c73cd70b8604844 /sys/arch
parentceeebc0b3ac3b54459166b7d21eeb7d051ebd710 (diff)
Fix a race causing hardclock() to be sometimes invoked between the end
of cpu_configure() and initclocks(). from Miod no objection deraadt@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sparc/sparc/clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/sparc/sparc/clock.c b/sys/arch/sparc/sparc/clock.c
index 7fa101c7b01..11fccb4e40e 100644
--- a/sys/arch/sparc/sparc/clock.c
+++ b/sys/arch/sparc/sparc/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.33 2015/09/19 21:07:04 semarie Exp $ */
+/* $OpenBSD: clock.c,v 1.34 2016/01/19 17:57:07 ajacoutot Exp $ */
/* $NetBSD: clock.c,v 1.52 1997/05/24 20:16:05 pk Exp $ */
/*
@@ -800,7 +800,7 @@ forward:
* XXX Clock interrupts are enabled (and therefore serviceable)
* XXX before initclocks() has completed.
*/
- if (cold == 0)
+ if (profhz != 0)
hardclock((struct clockframe *)cap);
return (1);