From cdef4a78753170711e2ce949f09e55b3e55556df Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Thu, 9 Oct 2003 16:30:59 +0000
Subject: Minor cpp changes to let all kernels in conf/ compile.

---
 sys/arch/mvme88k/mvme88k/eh.S      | 4 +---
 sys/arch/mvme88k/mvme88k/machdep.c | 6 +++++-
 sys/arch/mvme88k/mvme88k/trap.c    | 7 +++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/mvme88k/mvme88k/eh.S b/sys/arch/mvme88k/mvme88k/eh.S
index 2493b20dff8..9c6c8d0a6df 100644
--- a/sys/arch/mvme88k/mvme88k/eh.S
+++ b/sys/arch/mvme88k/mvme88k/eh.S
@@ -1,4 +1,4 @@
-/*   $OpenBSD: eh.S,v 1.44 2003/10/05 21:22:02 miod Exp $   */
+/*   $OpenBSD: eh.S,v 1.45 2003/10/09 16:30:58 miod Exp $   */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -947,9 +947,7 @@ ASLOCAL(m88110_badaddr__return_nonzero)
 	stcr	r0, DPAR
 	/* FALLTHROUGH */
 #endif
-#ifdef M88100
 ASLOCAL(badaddr__return_nonzero)
-#endif
 	or	r2, r0, 1
 	/* FALLTHROUGH */
 
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index fb0314e151b..443965e350b 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.116 2003/10/05 20:27:47 miod Exp $	*/
+/* $OpenBSD: machdep.c,v 1.117 2003/10/09 16:30:58 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -2293,8 +2293,12 @@ mvme_bootstrap()
 {
 	extern int kernelstart;
 	extern struct consdev *cn_tab;
+#ifdef MVME197
 	extern struct cmmu_p cmmu88110;
+#endif
+#if defined(MVME187) || defined(MVME188)
 	extern struct cmmu_p cmmu8820x;
+#endif
 	extern void set_tcfp(void);
 
 	struct mvmeprom_brdid brdid;
diff --git a/sys/arch/mvme88k/mvme88k/trap.c b/sys/arch/mvme88k/mvme88k/trap.c
index 49458fd4fb3..82e506a52ed 100644
--- a/sys/arch/mvme88k/mvme88k/trap.c
+++ b/sys/arch/mvme88k/mvme88k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.54 2003/10/05 20:27:47 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.55 2003/10/09 16:30:58 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -204,7 +204,10 @@ m88100_trap(unsigned type, struct m88100_saved_state *frame)
 	unsigned nss, fault_addr;
 	struct vmspace *vm;
 	union sigval sv;
-	int result, s;
+	int result;
+#ifdef DDB
+	int s;
+#endif
 	int sig = 0;
 	unsigned pc = PC_REGS(frame);  /* get program counter (sxip) */
 
-- 
cgit v1.2.3