summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorkstailey <kstailey@cvs.openbsd.org>1997-01-16 19:57:18 +0000
committerkstailey <kstailey@cvs.openbsd.org>1997-01-16 19:57:18 +0000
commita92f56b13fd3ba3ef0a28d0db5a07a6919db4040 (patch)
tree9f03753e091cf59cde093463ff6c7c671f704c97 /sys
parent0af92e0e3bbb14cb90ec458b6cc08e41846cac95 (diff)
do not call resettodr() if RB_TIMEBAD is set due to being in ddb with clock updates suspended
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/i386/machdep.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index cfa7aac7cdf..f71fa034c0b 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.33 1996/12/29 12:27:26 graichen Exp $ */
+/* $OpenBSD: machdep.c,v 1.34 1997/01/16 19:57:17 kstailey Exp $ */
/* $NetBSD: machdep.c,v 1.202 1996/05/18 15:54:59 christos Exp $ */
/*-
@@ -794,7 +794,11 @@ boot(howto)
* If we've been adjusting the clock, the todr
* will be out of synch; adjust it now.
*/
- resettodr();
+ if ((howto & RB_TIMEBAD) == 0) {
+ resettodr();
+ } else {
+ printf("WARNING: not updating battery clock\n");
+ }
}
/* Disable interrupts. */