Mon Jan 25 13:08:05 2021 UTC ()
Remove #undefs against INTERRUPT_SAVEREG and INTERRUPT_RESTOREREG.
They have been defined in <m68k/asm.h> for years.
(tsutsui)
diff -r1.64 -r1.65 src/sys/arch/luna68k/luna68k/locore.s
diff -r1.115 -r1.116 src/sys/arch/mvme68k/mvme68k/locore.s
diff -r1.66 -r1.67 src/sys/arch/next68k/next68k/locore.s
diff -r1.66 -r1.67 src/sys/arch/sun3/sun3x/locore.s
--- src/sys/arch/luna68k/luna68k/locore.s 2019/06/30 05:04:49 1.64
+++ src/sys/arch/luna68k/luna68k/locore.s 2021/01/25 13:08:04 1.65
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.64 2019/06/30 05:04:49 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.65 2021/01/25 13:08:04 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -661,9 +661,6 @@
subql #1,_C_LABEL(idepth)
jra _ASM_LABEL(rei) | all done
#endif
-
-#undef INTERRUPT_SAVEREG
-#undef INTERRUPT_RESTOREREG
/*
* Emulation of VAX REI instruction.
--- src/sys/arch/mvme68k/mvme68k/locore.s 2018/12/19 13:57:48 1.115
+++ src/sys/arch/mvme68k/mvme68k/locore.s 2021/01/25 13:08:05 1.116
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.115 2018/12/19 13:57:48 maxv Exp $ */
+/* $NetBSD: locore.s,v 1.116 2021/01/25 13:08:05 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -973,9 +973,6 @@
subql #1,_C_LABEL(interrupt_depth)
/* FALLTHROUGH to rei */
-
-#undef INTERRUPT_SAVEREG
-#undef INTERRUPT_RESTOREREG
/*
* Emulation of VAX REI instruction.
--- src/sys/arch/next68k/next68k/locore.s 2018/12/19 13:57:49 1.66
+++ src/sys/arch/next68k/next68k/locore.s 2021/01/25 13:08:05 1.67
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.66 2018/12/19 13:57:49 maxv Exp $ */
+/* $NetBSD: locore.s,v 1.67 2021/01/25 13:08:05 tsutsui Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -805,9 +805,6 @@
/* FALLTHROUGH to rei */
jra _ASM_LABEL(rei) | all done
-
-#undef INTERRUPT_SAVEREG
-#undef INTERRUPT_RESTOREREG
/*
* Emulation of VAX REI instruction.
--- src/sys/arch/sun3/sun3x/locore.s 2018/12/19 13:57:51 1.66
+++ src/sys/arch/sun3/sun3x/locore.s 2021/01/25 13:08:05 1.67
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.66 2018/12/19 13:57:51 maxv Exp $ */
+/* $NetBSD: locore.s,v 1.67 2021/01/25 13:08:05 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -469,9 +469,6 @@
jbsr _C_LABEL(isr_vectored)
INTERRUPT_RESTOREREG
jra _ASM_LABEL(rei)
-
-#undef INTERRUPT_SAVEREG
-#undef INTERRUPT_RESTOREREG
/* interrupt counters (needed by vmstat) */
GLOBAL(intrnames)