Assorted changes to really let non-DDB kernels (such as the future RAMDISK,

hint, hint) compile.

4 files changed, 12 insertions, 17 deletions

diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c
index de33a9e745f..a6dae4136d5 100644
--- a/sys/arch/mvme88k/dev/vs.c
+++ b/sys/arch/mvme88k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.9 2001/08/26 02:37:07 miod Exp $ */
+/*	$OpenBSD: vs.c,v 1.10 2001/08/31 01:52:19 miod Exp $ */
 
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -893,7 +893,9 @@ vs_eintr(sc)
 		break;
 	default:
 		printf("%s: Uh oh!... Error 0x%x\n", vs_name(sc), ecode);
+#ifdef DDB
 		Debugger();
+#endif
 	}
 #ifdef SDEBUG
 	printf("%s: crsw = 0x%x iopb_type = %d iopb_len = %d wq = %d error = 0x%x\n", 
diff --git a/sys/arch/mvme88k/mvme88k/m18x_cmmu.c b/sys/arch/mvme88k/mvme88k/m18x_cmmu.c
index b15f2e440e9..817ffb42a6f 100644
--- a/sys/arch/mvme88k/mvme88k/m18x_cmmu.c
+++ b/sys/arch/mvme88k/mvme88k/m18x_cmmu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m18x_cmmu.c,v 1.13 2001/08/26 14:31:12 miod Exp $	*/
+/*	$OpenBSD: m18x_cmmu.c,v 1.14 2001/08/31 01:52:22 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -2319,8 +2319,6 @@ m18x_cmmu_cache_state(addr, supervisor_flag)
 
 }
 
-#endif /* DDB */
-
 void
 m18x_show_cmmu_info(addr)
 	unsigned addr;
@@ -2336,3 +2334,5 @@ m18x_show_cmmu_info(addr)
 			m18x_cmmu_show_translation(addr, 1, 0, cmmu_num);
 		}
 }
+
+#endif /* DDB */
diff --git a/sys/arch/mvme88k/mvme88k/m197_cmmu.c b/sys/arch/mvme88k/mvme88k/m197_cmmu.c
index c31863394cc..43dea6fb3c8 100644
--- a/sys/arch/mvme88k/mvme88k/m197_cmmu.c
+++ b/sys/arch/mvme88k/mvme88k/m197_cmmu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m197_cmmu.c,v 1.8 2001/08/26 14:31:12 miod Exp $	*/
+/*	$OpenBSD: m197_cmmu.c,v 1.9 2001/08/31 01:52:22 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -71,8 +71,6 @@
 #include <ddb/db_output.h>
 #endif
 
-#define CMMU_DEBUG 1
-
 #ifdef DEBUG
 #define DB_CMMU		0x4000	/* MMU debug */
 unsigned int debuglevel = 0;
@@ -92,13 +90,7 @@ unsigned int debuglevel = 0;
 #define REGS(cpu, data) (*CMMU(cpu, data)->cmmu_regs)
 
 /* prototypes */
-#ifdef CMMU_DEBUG
-void m197_show_apr __P((unsigned));
-void m197_show_sctr __P((unsigned));
-#endif
 void m197_cmmu_store __P((int, int, unsigned));
-void m197_setup_cmmu_config __P((void));
-void m197_setup_board_config __P((void));
 int m197_cmmu_alive __P((int));
 unsigned m197_cmmu_get __P((int, int));
 void m197_cmmu_set __P((int, unsigned, int, int, int, int, vm_offset_t));
@@ -106,9 +98,6 @@ int probe_mmu __P((vm_offset_t, int));
 void m197_cmmu_sync_cache __P((vm_offset_t, int));
 void m197_cmmu_sync_inval_cache __P((vm_offset_t, int));
 void m197_cmmu_inval_cache __P((vm_offset_t, int));
-void m197_cmmu_show_translation __P((unsigned, unsigned, unsigned, int));
-void m197_show_cmmu_info __P((unsigned));
-void m197_cmmu_cache_state __P((unsigned, unsigned));
 
 /* 
  * This lock protects the cmmu SAR and SCR's; other ports 
diff --git a/sys/arch/mvme88k/mvme88k/trap.c b/sys/arch/mvme88k/mvme88k/trap.c
index c4c00c4a363..d1b025a13b1 100644
--- a/sys/arch/mvme88k/mvme88k/trap.c
+++ b/sys/arch/mvme88k/mvme88k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.20 2001/08/31 01:06:29 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.21 2001/08/31 01:52:22 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -410,7 +410,9 @@ trap18x(unsigned type, struct m88100_saved_state *frame)
 		 */
 		if ((unsigned)map & 3) {
 			printf("map is not word aligned! 0x%x\n", map);
+#ifdef DDB
 			Debugger();
+#endif
 		}
 		if ((frame->dpfsr >> 16 & 0x7) == 0x4	     /* seg fault  */
 		    || (frame->dpfsr >> 16 & 0x7) == 0x5) {  /* page fault */
@@ -493,7 +495,9 @@ outtahere:
 		map = &vm->vm_map;
 		if ((unsigned)map & 3) {
 			printf("map is not word aligned! 0x%x\n", map);
+#ifdef DDB
 			Debugger();
+#endif
 		}
 		/* Call vm_fault() to resolve non-bus error faults */
 		if ((frame->ipfsr >> 16 & 0x7) != 0x3 &&