summaryrefslogtreecommitdiff
path: root/sys/arch/amiga
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-01-18 12:48:02 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-01-18 12:48:02 +0000
commit1b919998ee142df1e74a445c5c93f5f1a7b5ee81 (patch)
tree708c6705feab399078ff8cc94f52d552755a05f3 /sys/arch/amiga
parent4894bee5aacc9d932af6d3dffb479fb48735e103 (diff)
move the RB_TIMEBAD handling to where "howto" is reachable
Diffstat (limited to 'sys/arch/amiga')
-rw-r--r--sys/arch/amiga/amiga/machdep.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index 95619f69328..5796b561a68 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.17 1997/01/17 05:53:39 kstailey Exp $ */
+/* $OpenBSD: machdep.c,v 1.18 1997/01/18 12:48:01 niklas Exp $ */
/* $NetBSD: machdep.c,v 1.82 1996/12/17 07:32:54 is Exp $ */
/*
@@ -1034,17 +1034,6 @@ bootsync(void)
if (waittime < 0) {
waittime = 0;
vfs_shutdown();
-
- /*
- * If we've been adjusting the clock, the todr
- * will be out of synch; adjust it now unless
- * the system was sitting in ddb.
- */
- if ((howto & RB_TIMEBAD) == 0) {
- resettodr();
- } else {
- printf("WARNING: not updating battery clock\n");
- }
}
}
@@ -1057,9 +1046,21 @@ boot(howto)
savectx(&curproc->p_addr->u_pcb);
boothowto = howto;
- if ((howto & RB_NOSYNC) == 0)
+ if ((howto & RB_NOSYNC) == 0) {
bootsync();
+ /*
+ * If we've been adjusting the clock, the todr
+ * will be out of synch; adjust it now unless
+ * the system was sitting in ddb.
+ */
+ if ((howto & RB_TIMEBAD) == 0) {
+ resettodr();
+ } else {
+ printf("WARNING: not updating battery clock\n");
+ }
+ }
+
/* Disable interrupts. */
spl7();