4 files changed, 19 insertions, 20 deletions
diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h
index bf975efb6ab..277de3a261b 100644
--- a/sys/arch/m88k/include/cpu.h
+++ b/sys/arch/m88k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.12 2005/12/11 21:45:28 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.13 2006/04/15 15:43:36 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -232,7 +232,6 @@ struct switchframe {
 };
 
 int badvaddr(vaddr_t, int);
-void nmihand(void *);
 
 #endif /* _KERNEL */
 #endif /* __M88K_CPU_H__ */
diff --git a/sys/arch/m88k/m88k/m88k_machdep.c b/sys/arch/m88k/m88k/m88k_machdep.c
index 471662e34ec..5b248b9eee6 100644
--- a/sys/arch/m88k/m88k/m88k_machdep.c
+++ b/sys/arch/m88k/m88k/m88k_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88k_machdep.c,v 1.13 2005/12/11 21:36:06 miod Exp $	*/
+/*	$OpenBSD: m88k_machdep.c,v 1.14 2006/04/15 15:43:33 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -92,8 +92,6 @@ u_int	max_cpus;
 
 struct cmmu_p *cmmu;
 
-int longformat = 1;  /* for regdump() */
-
 /*
  * safepri is a safe priority for sleep to set for a spin-wait
  * during autoconfiguration or after a panic.
@@ -238,20 +236,8 @@ remrunqueue(vp)
 		whichqs &= ~(1 << which);
 }
 
-void
-nmihand(void *framep)
-{
 #ifdef DDB
-	printf("Abort Pressed\n");
-	Debugger();
-#else
-	struct trapframe *frame = framep;
-
-	printf("Spurious NMI?\n");
-	regdump(frame);
-#endif /* DDB */
-}
-
+int longformat = 1;
 void
 regdump(struct trapframe *f)
 {
@@ -315,6 +301,7 @@ regdump(struct trapframe *f)
 	}
 #endif
 }
+#endif	/* DDB */
 
 /*
  * Set up the cpu_info pointer and the cpu number for the current processor.
diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h
index 34394f553d2..bdf7ab52cea 100644
--- a/sys/arch/mvme88k/include/cpu.h
+++ b/sys/arch/mvme88k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.32 2004/11/09 12:01:16 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.33 2006/04/15 15:43:36 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -74,6 +74,8 @@ int	intr_establish(int, struct intrhand *, const char *);
 typedef SLIST_HEAD(, intrhand) intrhand_t;
 extern intrhand_t intr_handlers[NVMEINTR];
 
+void nmihand(void *);
+
 #endif /* _KERNEL */
 
 #endif
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index dee6d6430c7..05cbfbb57d1 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.177 2006/04/13 21:16:18 miod Exp $	*/
+/* $OpenBSD: machdep.c,v 1.178 2006/04/15 15:43:36 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -86,6 +86,7 @@
 #include <machine/db_machdep.h>
 #include <ddb/db_extern.h>
 #include <ddb/db_interface.h>
+#include <ddb/db_var.h>
 #endif /* DDB */
 
 typedef struct {
@@ -894,6 +895,16 @@ intr_establish(int vec, struct intrhand *ihand, const char *name)
 	return (0);
 }
 
+void
+nmihand(void *frame)
+{
+#ifdef DDB
+	printf("Abort switch pressed\n");
+	if (db_console)
+		Debugger();
+#endif
+}
+
 int
 cpu_exec_aout_makecmds(p, epp)
 	struct proc *p;