Only start using the rtc for statclock after we've received the first

interrupt.  On some machines the rtc doesn't generate interrupts and we would
end up not running statclock() at all.

ok miod@, art@

1 files changed, 9 insertions, 3 deletions

diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index 3e3661a2aee..dd2cc70c26a 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.41 2007/11/28 17:05:09 tedu Exp $	*/
+/*	$OpenBSD: clock.c,v 1.42 2009/01/29 13:36:17 kettenis Exp $	*/
 /*	$NetBSD: clock.c,v 1.39 1996/05/12 23:11:54 mycroft Exp $	*/
 
 /*-
@@ -235,6 +235,14 @@ rtcintr(void *arg)
 	struct clockframe *frame = arg;		/* not strictly necessary */
 	u_int stat = 0;
 
+	if (stathz == 0) {
+		extern int psratio;
+
+		stathz = 128;
+		profhz = 1024;
+		psratio = profhz / stathz;
+	}
+
 	/* 
 	 * If rtcintr is 'late', next intr may happen immediately. 
 	 * Get them all. (Also, see comment in cpu_initclocks().)
@@ -393,8 +401,6 @@ void
 i8254_initclocks(void)
 {
 	static struct timeout rtcdrain_timeout;
-	stathz = 128;
-	profhz = 1024;
 
 	/*
 	 * XXX If you're doing strange things with multiple clocks, you might