Module Name: src
Committed By: tsutsui
Date: Mon Jan 25 13:08:05 UTC 2021
Modified Files:
src/sys/arch/luna68k/luna68k: locore.s
src/sys/arch/mvme68k/mvme68k: locore.s
src/sys/arch/next68k/next68k: locore.s
src/sys/arch/sun3/sun3x: locore.s
Log Message:
Remove #undefs against INTERRUPT_SAVEREG and INTERRUPT_RESTOREREG.
They have been defined in <m68k/asm.h> for years.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/mvme68k/mvme68k/locore.s
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/next68k/next68k/locore.s
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/sun3/sun3x/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.64 src/sys/arch/luna68k/luna68k/locore.s:1.65
--- src/sys/arch/luna68k/luna68k/locore.s:1.64 Sun Jun 30 05:04:49 2019
+++ src/sys/arch/luna68k/luna68k/locore.s Mon Jan 25 13:08:04 2021
@@ -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.
@@ -662,9 +662,6 @@ ENTRY_NOPROFILE(lev5intr)
jra _ASM_LABEL(rei) | all done
#endif
-#undef INTERRUPT_SAVEREG
-#undef INTERRUPT_RESTOREREG
-
/*
* Emulation of VAX REI instruction.
*
Index: src/sys/arch/mvme68k/mvme68k/locore.s
diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.115 src/sys/arch/mvme68k/mvme68k/locore.s:1.116
--- src/sys/arch/mvme68k/mvme68k/locore.s:1.115 Wed Dec 19 13:57:48 2018
+++ src/sys/arch/mvme68k/mvme68k/locore.s Mon Jan 25 13:08:05 2021
@@ -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.
@@ -974,9 +974,6 @@ Lintrhand_exit:
/* FALLTHROUGH to rei */
-#undef INTERRUPT_SAVEREG
-#undef INTERRUPT_RESTOREREG
-
/*
* Emulation of VAX REI instruction.
*
Index: src/sys/arch/next68k/next68k/locore.s
diff -u src/sys/arch/next68k/next68k/locore.s:1.66 src/sys/arch/next68k/next68k/locore.s:1.67
--- src/sys/arch/next68k/next68k/locore.s:1.66 Wed Dec 19 13:57:49 2018
+++ src/sys/arch/next68k/next68k/locore.s Mon Jan 25 13:08:05 2021
@@ -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
@@ -806,9 +806,6 @@ Lintrhand_exit:
/* FALLTHROUGH to rei */
jra _ASM_LABEL(rei) | all done
-#undef INTERRUPT_SAVEREG
-#undef INTERRUPT_RESTOREREG
-
/*
* Emulation of VAX REI instruction.
*
Index: src/sys/arch/sun3/sun3x/locore.s
diff -u src/sys/arch/sun3/sun3x/locore.s:1.66 src/sys/arch/sun3/sun3x/locore.s:1.67
--- src/sys/arch/sun3/sun3x/locore.s:1.66 Wed Dec 19 13:57:51 2018
+++ src/sys/arch/sun3/sun3x/locore.s Mon Jan 25 13:08:05 2021
@@ -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.
@@ -470,9 +470,6 @@ GLOBAL(_isr_vectored)
INTERRUPT_RESTOREREG
jra _ASM_LABEL(rei)
-#undef INTERRUPT_SAVEREG
-#undef INTERRUPT_RESTOREREG
-
/* interrupt counters (needed by vmstat) */
GLOBAL(intrnames)
.asciz "spur" | 0
