7 files changed, 22 insertions, 23 deletions
diff --git a/sys/arch/mvme68k/dev/clock.c b/sys/arch/mvme68k/dev/clock.c
index 6dc13da265c..2a9869e2a31 100644
--- a/sys/arch/mvme68k/dev/clock.c
+++ b/sys/arch/mvme68k/dev/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.5 2002/04/27 23:21:05 miod Exp $ */
+/*	$OpenBSD: clock.c,v 1.6 2002/04/28 14:47:50 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -381,7 +381,9 @@ void
 delay(us)
 	int us;
 {
+#if (NPCC > 0) || (NPCCTWO > 0)
 	volatile register int c;
+#endif
 
 	switch (clockbus) {
 #if NPCC > 0
diff --git a/sys/arch/mvme68k/dev/sram.c b/sys/arch/mvme68k/dev/sram.c
index 85aa2ea2ab0..37cb772c107 100644
--- a/sys/arch/mvme68k/dev/sram.c
+++ b/sys/arch/mvme68k/dev/sram.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sram.c,v 1.9 2002/04/27 23:21:05 miod Exp $ */
+/*	$OpenBSD: sram.c,v 1.10 2002/04/28 14:47:50 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -93,7 +93,9 @@ sramattach(parent, self, args)
 {
 	struct confargs *ca = args;
 	struct sramsoftc *sc = (struct sramsoftc *)self;
+#ifdef MVME162
 	struct mcreg *mc;
+#endif
 
 	switch (cputyp) {
 #ifdef MVME162
diff --git a/sys/arch/mvme68k/dev/vme.c b/sys/arch/mvme68k/dev/vme.c
index 89af7dab4e5..72fef07d142 100644
--- a/sys/arch/mvme68k/dev/vme.c
+++ b/sys/arch/mvme68k/dev/vme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vme.c,v 1.13 2002/04/27 23:21:05 miod Exp $ */
+/*	$OpenBSD: vme.c,v 1.14 2002/04/28 14:47:50 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -89,9 +89,9 @@ vmematch(parent, cf, args)
 	void *cf;
 	void *args;
 {
+#if NMC > 0
 	struct confargs *ca = args;
 
-#if NMC > 0
 	if (ca->ca_bustype == BUS_MC) {
 		struct mcreg *mc = (struct mcreg *)ca->ca_master;
 
@@ -344,8 +344,12 @@ vmeattach(parent, self, args)
 {
 	struct vmesoftc *sc = (struct vmesoftc *)self;
 	struct confargs *ca = args;
+#if NPCC > 0
 	struct vme1reg *vme1;
+#endif
+#if NMC > 0 || NPCCTWO > 0
 	struct vme2reg *vme2;
+#endif
 	int scon;
 
 	sc->sc_vaddr = ca->ca_vaddr;
diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h
index 6ca9e45aaff..2ff957d0f1a 100644
--- a/sys/arch/mvme68k/include/cpu.h
+++ b/sys/arch/mvme68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.12 2002/04/27 23:21:05 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.13 2002/04/28 14:47:53 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -224,7 +224,7 @@ void	TBIA(void);
 void	TBIS(vaddr_t);
 void	TBIAS(void);
 void	TBIAU(void);
-#if defined(M68040)
+#if defined(M68040) || defined(M68060)
 void	DCFA(void);
 void	DCFP(paddr_t);
 void	DCFL(paddr_t);
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 64c9d413f3a..bfc6a613518 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.70 2002/04/27 23:21:06 miod Exp $ */
+/*	$OpenBSD: machdep.c,v 1.71 2002/04/28 14:47:53 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -510,7 +510,9 @@ identifycpu()
 	char mc;
 	char speed[6];
 	char suffix[30];
+#ifdef FPSP
 	extern u_long fpvect_tab, fpvect_end, fpsp_tab;
+#endif
 	int len;
 
 	bzero(suffix, sizeof suffix);
@@ -947,12 +949,10 @@ initvectors()
 	typedef void trapfun(void);
 
 	/* XXX should init '40 vecs here, too */
-#if defined(M68060) || defined(M68040)
+#if defined(M68060)
 	extern trapfun *vectab[256];
 	extern trapfun addrerr4060;
-#endif
 
-#ifdef M68060
 	extern trapfun buserr60;
 #if defined(M060SP)
 	/*extern u_int8_t I_CALL_TOP[];*/
@@ -964,14 +964,6 @@ initvectors()
 	extern trapfun fpfault;
 #endif
 
-#ifdef M68040
-	extern trapfun buserr40;
-#endif
-
-#ifdef FPU_EMULATE
-	extern trapfun fpemuli;
-#endif
-
 #ifdef M68060
 	if (cputype == CPU_68060) {
 		asm volatile ("movl %0,d0; .word 0x4e7b,0x0808" : : 
diff --git a/sys/arch/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c
index 8fae0449849..4763ab45aa8 100644
--- a/sys/arch/mvme68k/mvme68k/trap.c
+++ b/sys/arch/mvme68k/mvme68k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.43 2002/04/27 23:21:06 miod Exp $ */
+/*	$OpenBSD: trap.c,v 1.44 2002/04/28 14:47:54 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -189,7 +189,7 @@ userret(p, fp, oticks, faultaddr, fromtrap)
 	int fromtrap;
 {
 	int sig;
-#if defined(M68040) || defined(M68060)
+#if defined(M68040)
 	int beenhere = 0;
 
 again:
diff --git a/sys/arch/mvme68k/mvme68k/vm_machdep.c b/sys/arch/mvme68k/mvme68k/vm_machdep.c
index a09bcc7a10b..027c7c6d1f0 100644
--- a/sys/arch/mvme68k/mvme68k/vm_machdep.c
+++ b/sys/arch/mvme68k/mvme68k/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.34 2002/04/27 23:21:06 miod Exp $ */
+/*	$OpenBSD: vm_machdep.c,v 1.35 2002/04/28 14:47:54 miod Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -247,14 +247,13 @@ vmapbuf(bp, siz)
 {
 	register int npf;
 	register caddr_t addr;
-	register long flags = bp->b_flags;
 	struct proc *p;
 	int off;
 	vm_offset_t kva;
 	vm_offset_t pa;
 
 #ifdef DIAGNOSTIC
-	if ((flags & B_PHYS) == 0)
+	if ((bp->b_flags & B_PHYS) == 0)
 		panic("vmapbuf");
 #endif