summaryrefslogtreecommitdiff
path: root/sys/arch/m88k
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-04-15 15:43:37 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-04-15 15:43:37 +0000
commit8f7b656ea6a3d1ec33e235d9b10829e53f52ca51 (patch)
tree901ba918a2dbbb7ab643d48f0ab53c157056b93c /sys/arch/m88k
parent293969a3228cdc75330f4cbb2027e2c4f897f6b1 (diff)
nmihand() is mvme88k only, move it out of m88k common area.
Diffstat (limited to 'sys/arch/m88k')
-rw-r--r--sys/arch/m88k/include/cpu.h3
-rw-r--r--sys/arch/m88k/m88k/m88k_machdep.c19
2 files changed, 4 insertions, 18 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.