From: niklas <niklas@openbsd.org>
Date: Sat, 18 Jan 1997 12:48:01 +0000 (+0000)
Subject: move the RB_TIMEBAD handling to where "howto" is reachable
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c459f17dd12ab1ba42fa2de1e8dfb7e95306f8da;p=openbsd

move the RB_TIMEBAD handling to where "howto" is reachable
---

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();