From: Mike Karels <karels@ucbvax.Berkeley.EDU>
Date: Tue, 14 Jan 1986 09:53:12 +0000 (-0800)
Subject: flush text cache and resynch todr clock on boot;
X-Git-Tag: BSD-4_3-Snapshot-Development~3572
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/75395bd6efc5ad2272ba624fdcee0b3c35ccdc88

flush text cache and resynch todr clock on boot;
fix and use microtime; more spl[67]'s bite the dust

SCCS-vsn: sys/vax/vax/machdep.c 6.23
---

diff --git a/usr/src/sys/vax/vax/machdep.c b/usr/src/sys/vax/vax/machdep.c
index 9e88e65802..dde6b143f2 100644
--- a/usr/src/sys/vax/vax/machdep.c
+++ b/usr/src/sys/vax/vax/machdep.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)machdep.c	6.22 (Berkeley) %G%
+ *	@(#)machdep.c	6.23 (Berkeley) %G%
  */
 
 #include "reg.h"
@@ -734,6 +734,10 @@ boot(paniced, arghowto)
 		waittime = 0;
 		(void) splnet();
 		printf("syncing disks... ");
+		/*
+		 * Release inodes held by texts before update.
+		 */
+		xumount(NODEV);
 		update();
 		{ register struct buf *bp;
 		  int iter, nbusy;
@@ -750,6 +754,11 @@ boot(paniced, arghowto)
 		  }
 		}
 		printf("done\n");
+		/*
+		 * If we've been adjusting the clock, the todr
+		 * will be out of synch; adjust it now.
+		 */
+		resettodr();
 	}
 	splx(0x1f);			/* extreme priority */
 	devtype = major(rootdev);
@@ -1081,21 +1090,19 @@ machinecheck(cmcf)
 	panic("mchk");
 }
 
-#ifdef notdef
 microtime(tvp)
-	struct timeval *tvp;
+	register struct timeval *tvp;
 {
-	int s = spl7();
+	int s = splhigh();
 
-	tvp->tv_sec = time.tv_sec;
-	tvp->tv_usec = (lbolt+1)*16667 + mfpr(ICR);
+	*tvp = time;
+	tvp->tv_usec += tick + mfpr(ICR);
 	while (tvp->tv_usec > 1000000) {
 		tvp->tv_sec++;
 		tvp->tv_usec -= 1000000;
 	}
 	splx(s);
 }
-#endif
 
 physstrat(bp, strat, prio)
 	struct buf *bp;
@@ -1107,7 +1114,7 @@ physstrat(bp, strat, prio)
 	/* pageout daemon doesn't wait for pushed pages */
 	if (bp->b_flags & B_DIRTY)
 		return;
-	s = spl6();
+	s = splbio();
 	while ((bp->b_flags & B_DONE) == 0)
 		sleep((caddr_t)bp, prio);
 	splx(s);