Module Name:    src
Committed By:   simonb
Date:           Sat Aug 22 09:08:21 UTC 2020

Modified Files:
        src/sys/arch/mips/include: locore.h

Log Message:
Invert the MIPS-I non-4kB page size check.  The previous check doesn't
fail if both MIPS1 and MIPS3_PLUS are defined.  Explictly check against
MIPS1.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/mips/include/locore.h

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/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.115 src/sys/arch/mips/include/locore.h:1.116
--- src/sys/arch/mips/include/locore.h:1.115	Mon Aug 17 03:19:35 2020
+++ src/sys/arch/mips/include/locore.h	Sat Aug 22 09:08:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.115 2020/08/17 03:19:35 mrg Exp $ */
+/* $NetBSD: locore.h,v 1.116 2020/08/22 09:08:21 simonb Exp $ */
 
 /*
  * This file should not be included by MI code!!!
@@ -89,8 +89,8 @@ typedef uint32_t pt_entry_t;
 #undef MIPS3_PLUS
 #endif
 
-#if !defined(MIPS3_PLUS) && (ENABLE_MIPS_8KB_PAGE + ENABLE_MIPS_16KB_PAGE) > 0
-#error MIPS1 does not support non-4KB page sizes.
+#if defined(MIPS1) && (ENABLE_MIPS_8KB_PAGE + ENABLE_MIPS_16KB_PAGE) > 0
+#error MIPS1 only supports a 4kB page size.
 #endif
 
 /* XXX some .S files look for MIPS3_PLUS */

Reply via email to