Folks,

How does the following patch to sys/arch/mips/include/cpuregs.h look?
It should stop the warnings that lint generates about "previously
defined symbols" or some such.  I've got a "make build" running at the
moment, but I'll test this before I commit it when that's done.  Prehaps
the changed lines should have "same as CPU PRID" at the end?

Simon.
--

Index: sys/arch/mips/include/cpuregs.h
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/mips/include/cpuregs.h,v
retrieving revision 1.26
diff -p -u -r1.26 cpuregs.h
--- cpuregs.h	1999/12/27 20:05:06	1.26
+++ cpuregs.h	2000/01/18 12:21:33
@@ -643,15 +643,15 @@
 #define MIPS_R31LSI	0x06	/* LSI Logic derivate		ISA I	*/
 #define MIPS_R10010	0x09	/* MIPS R10000/T5 FPU		ISA IV	*/
 #define MIPS_R4210	0x0a	/* NEC VR4210 FPC		ISA III */
-#define MIPS_R4300	0x0b	/* NEC VR4300 FPC		ISA III */
+/* #define MIPS_R4300	0x0b	 * NEC VR4300 FPC		ISA III */
 #define MIPS_R8000	0x10	/* MIPS R8000 Blackbird/TFP	ISA IV	*/
-#define MIPS_R4600	0x20	/* QED R4600 Orion FPU		ISA III */
+/* #define MIPS_R4600	0x20	 * QED R4600 Orion FPU		ISA III */
 #define MIPS_R5010	0x23	/* MIPS R5000 FPU		ISA IV	*/
-#define MIPS_RC32364	0x26	/* IDT RC32364 FPU		ISA II	*/
-#define MIPS_RM5230	0x28	/* QED RM5230 FPU		ISA IV	*/
-#define MIPS_R3SONY	0x21	/* ? Sony R3000 based FPU	ISA I	*/
+/* #define MIPS_RC32364	0x26	 * IDT RC32364 FPU		ISA II	*/
+/* #define MIPS_RM5230	0x28	 * QED RM5230 FPU		ISA IV	*/
+/* #define MIPS_R3SONY	0x21	 * ? Sony R3000 based FPU	ISA I	*/
 #define MIPS_R3TOSH	0x22	/* ? Toshiba R3000 based FPU	ISA I	*/
-#define MIPS_R3NKK	0x23	/* ? NKK R3000 based FPU	ISA I	*/
+/* #define MIPS_R3NKK	0x23	 * ? NKK R3000 based FPU	ISA I	*/
 
 #ifdef ENABLE_MIPS_TX3900
 #include <mips/r3900regs.h>