diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index 70c169a81cc2..fd2f8faa2e31 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -72,7 +72,7 @@
  * from: Utah $Hdr: machdep.c 1.63 91/04/24$
  *
  *	from: @(#)machdep.c	7.16 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.13 1994/04/21 23:29:59 briggs Exp $
+ *	$Id: machdep.c,v 1.14 1994/04/22 12:11:16 briggs Exp $
  */
 
 #include <param.h>
@@ -398,7 +398,6 @@ setregs(p, entry, sp, retval)
 identifycpu()
 {
 	extern unsigned long	bootdev, root_scsi_id,
-				cpu040, mmutype,
 				videobitdepth, videosize;
 /* MF Just a little interesting tidbit about what machine we are
    running on.  In the future magic may happen here based on
@@ -997,7 +996,7 @@ boot(howto)
 		savectx(curproc->p_addr, 0);
 
 	boothowto = howto;
-	if ((howto&RB_NOSYNC) == 0 && waittime < 0 && bfreelist[0].b_forw) {
+	if ((howto&RB_NOSYNC) == 0 && waittime < 0) {
 		register struct buf *bp;
 		int iter, nbusy;
 
@@ -2334,7 +2333,6 @@ extern long	(*via1itab[7])();
 extern long	adb_intr_II(void);
 extern long	adb_intr_SI(void);
 extern long	adb_intr_PB(void);
-extern long	cpu040;
 
 /* BG 1/2/94 */
 void setmachdep(void)
diff --git a/sys/arch/mac68k/mac68k/pmap.c b/sys/arch/mac68k/mac68k/pmap.c
index 5863629c8634..334bba4fb7b3 100644
--- a/sys/arch/mac68k/mac68k/pmap.c
+++ b/sys/arch/mac68k/mac68k/pmap.c
@@ -65,7 +65,7 @@
  */
 /* 
  *	from: @(#)pmap.c	7.5 (Berkeley) 5/10/91
- *	$Id: pmap.c,v 1.8 1994/04/21 23:30:45 briggs Exp $
+ *	$Id: pmap.c,v 1.9 1994/04/22 12:11:21 briggs Exp $
  */
 
 /*
@@ -255,7 +255,6 @@ boolean_t	pmap_initialized = FALSE;	/* Has pmap_init completed? */
 int		pmap_aliasmask;	/* seperation at which VA aliasing ok */
 char		*pmap_attributes;	/* reference and modify bits */
 static int	pmap_ishift;	/* segment table index shift */
-extern int	cpu040;
 
 boolean_t	pmap_testbit();
 void		pmap_enter_ptpage();
diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c
index 38438bcfa92e..e092c55c642d 100644
--- a/sys/arch/mac68k/mac68k/trap.c
+++ b/sys/arch/mac68k/mac68k/trap.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: trap.c 1.32 91/04/06$
  *
  *	@(#)trap.c	7.15 (Berkeley) 8/2/91
- *	$Id: trap.c,v 1.10 1994/04/21 23:32:43 briggs Exp $
+ *	$Id: trap.c,v 1.11 1994/04/22 12:11:24 briggs Exp $
  */
 
 #include <sys/param.h>
@@ -113,7 +113,6 @@ int mmudebug = 0;
 #endif
 
 extern struct pcb *curpcb;
-extern int	  cpu040;
 
 static void
 userret(p, pc, oticks)
@@ -577,7 +576,7 @@ trap(type, code, v, frame)
 		if (ssir & SIR_SERIAL) {
 			siroff(SIR_SERIAL);
 			cnt.v_soft++;
-			serintr();
+			sersir();
 		}
 		if (ssir & SIR_NET) {
 			siroff(SIR_NET);
diff --git a/sys/arch/mac68k/mac68k/vm_machdep.c b/sys/arch/mac68k/mac68k/vm_machdep.c
index f76b60435309..ff4a55bcae5a 100644
--- a/sys/arch/mac68k/mac68k/vm_machdep.c
+++ b/sys/arch/mac68k/mac68k/vm_machdep.c
@@ -39,7 +39,7 @@
  * from: Utah $Hdr: vm_machdep.c 1.21 91/04/06$
  *
  *	from: @(#)vm_machdep.c	7.10 (Berkeley) 5/7/91
- *	$Id: vm_machdep.c,v 1.5 1994/04/21 23:25:41 briggs Exp $
+ *	$Id: vm_machdep.c,v 1.6 1994/04/22 12:11:26 briggs Exp $
  */
 
 #include <sys/param.h>
@@ -55,8 +55,6 @@
 #include <vm/vm_kern.h>
 #include <machine/pte.h>
 
-extern int	cpu040;
-
 /*
  * Finish a fork operation, with process p2 nearly set up.
  * Copy and update the kernel stack and pcb, making the child