summaryrefslogtreecommitdiff
path: root/sys/arch/mvme68k
diff options
context:
space:
mode:
authorkstailey <kstailey@cvs.openbsd.org>1997-01-16 20:43:46 +0000
committerkstailey <kstailey@cvs.openbsd.org>1997-01-16 20:43:46 +0000
commitbd7fbb457605e2f68a21bceee7c234a1b1b96ef5 (patch)
tree2e205eb0c61f51cb39ab9d8c509bd7d2d7620db5 /sys/arch/mvme68k
parenta92f56b13fd3ba3ef0a28d0db5a07a6919db4040 (diff)
do not call resettodr() if RB_TIMEBAD is set due to being in ddb with clock updates suspended
Diffstat (limited to 'sys/arch/mvme68k')
-rw-r--r--sys/arch/mvme68k/mvme68k/machdep.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 80bf5a7cd33..57fec537bcf 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.12 1996/07/27 11:40:42 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.13 1997/01/16 20:43:38 kstailey Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -1104,9 +1104,14 @@ boot(howto)
vfs_shutdown();
/*
* If we've been adjusting the clock, the todr
- * will be out of synch; adjust it now.
+ * will be out of synch; adjust it now unless
+ * the system was sitting in ddb.
*/
- resettodr();
+ if ((howto & RB_TIMEBAD) == 0) {
+ resettodr();
+ } else {
+ printf("WARNING: not updating battery clock\n");
+ }
}
splhigh(); /* extreme priority */
if (howto&RB_HALT) {