diff --git a/sys/arch/arc/arc/locore_machdep.S b/sys/arch/arc/arc/locore_machdep.S
index b5cc0da9dad9..f83b9cf2e9f2 100644
--- a/sys/arch/arc/arc/locore_machdep.S
+++ b/sys/arch/arc/arc/locore_machdep.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_machdep.S,v 1.9 2003/05/25 14:00:12 tsutsui Exp $	*/
+/*	$NetBSD: locore_machdep.S,v 1.10 2003/06/09 12:20:38 simonb Exp $	*/
 /*	$OpenBSD: locore.S,v 1.12 1997/04/19 17:19:43 pefo Exp $	*/
 
 /*
@@ -359,8 +359,8 @@ END(mdbpanic)
  *--------------------------------------------------------------------------
  */
 LEAF(mips3_TLBWriteIndexedVPS)
-	mfc0	v1, MIPS_COP_0_STATUS_REG	# Save the status register.
-	mtc0	zero, MIPS_COP_0_STATUS_REG	# Disable interrupts
+	mfc0	v1, MIPS_COP_0_STATUS		# Save the status register.
+	mtc0	zero, MIPS_COP_0_STATUS		# Disable interrupts
 	nop
 	lw	a2, 8(a1)
 	lw	a3, 12(a1)
@@ -387,7 +387,7 @@ LEAF(mips3_TLBWriteIndexedVPS)
 	nop
 	dmtc0	v0, MIPS_COP_0_TLB_PG_MASK	# Restore page mask.
 	j	ra
-	mtc0	v1, MIPS_COP_0_STATUS_REG	# Restore the status register
+	mtc0	v1, MIPS_COP_0_STATUS		# Restore the status register
 END(mips3_TLBWriteIndexedVPS)
 
 
diff --git a/sys/arch/mips/include/cpuregs.h b/sys/arch/mips/include/cpuregs.h
index 8fe39922109e..8fef60c33f6e 100644
--- a/sys/arch/mips/include/cpuregs.h
+++ b/sys/arch/mips/include/cpuregs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuregs.h,v 1.59 2003/01/10 03:22:48 rafal Exp $	*/
+/*	$NetBSD: cpuregs.h,v 1.60 2003/06/09 12:20:37 simonb Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -456,8 +456,6 @@
 					/* $5 and $6 new with MIPS-III */
 #define	MIPS_COP_0_BAD_VADDR	_(8)
 #define	MIPS_COP_0_TLB_HI	_(10)
-#define	MIPS_COP_0_STATUS_REG	_(12)
-#define	MIPS_COP_0_CAUSE_REG	_(13)
 #define	MIPS_COP_0_STATUS	_(12)
 #define	MIPS_COP_0_CAUSE	_(13)
 #define	MIPS_COP_0_EXC_PC	_(14)
diff --git a/sys/arch/mips/mips/mips5900_subr.S b/sys/arch/mips/mips/mips5900_subr.S
index 6e3cec436bd1..6b64e61ee295 100644
--- a/sys/arch/mips/mips/mips5900_subr.S
+++ b/sys/arch/mips/mips/mips5900_subr.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: mips5900_subr.S,v 1.1 2002/03/05 15:51:00 simonb Exp $	*/
+/*	$NetBSD: mips5900_subr.S,v 1.2 2003/06/09 12:20:38 simonb Exp $	*/
 
 #undef MIPS1
 /* #undef MIPS3 */
@@ -37,12 +37,12 @@ LEAF_NOPROFILE(_intr_resume)
 END(_intr_resume)
 
 LEAF_NOPROFILE(_intr_suspend)
-	mfc0	v0, MIPS_COP_0_STATUS_REG       
+	mfc0	v0, MIPS_COP_0_STATUS       
 	lui	t0, 0x1		/* EIE bit */
 	and	v0, v0, t0
 1:	di
 	sync.p
-	mfc0	t1, MIPS_COP_0_STATUS_REG
+	mfc0	t1, MIPS_COP_0_STATUS
 	and	t2, t0, t1
 	beq	t2, t0, 1b
 	nop
diff --git a/sys/arch/mipsco/mipsco/locore_machdep.S b/sys/arch/mipsco/mipsco/locore_machdep.S
index c92020003ca9..e677ba46d4fc 100644
--- a/sys/arch/mipsco/mipsco/locore_machdep.S
+++ b/sys/arch/mipsco/mipsco/locore_machdep.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_machdep.S,v 1.3 2002/06/01 12:27:05 simonb Exp $	*/
+/*	$NetBSD: locore_machdep.S,v 1.4 2003/06/09 12:20:38 simonb Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
 LEAF(to_monitor)
 	mtc0	zero, MIPS_COP_0_STATUS		# Disable interrupts
 	li	v0, MIPS_SR_BEV			# no interrupt and
-	mtc0	v0, MIPS_COP_0_STATUS_REG	# boot strap exception vector
+	mtc0	v0, MIPS_COP_0_STATUS		# boot strap exception vector
 	nop
 	nop
 	nop
diff --git a/sys/arch/newsmips/newsmips/locore_machdep.S b/sys/arch/newsmips/newsmips/locore_machdep.S
index 3b7b922faec4..06cda5b8d004 100644
--- a/sys/arch/newsmips/newsmips/locore_machdep.S
+++ b/sys/arch/newsmips/newsmips/locore_machdep.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_machdep.S,v 1.11 2003/05/25 15:03:21 tsutsui Exp $	*/
+/*	$NetBSD: locore_machdep.S,v 1.12 2003/06/09 12:20:38 simonb Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -68,7 +68,7 @@
 
 LEAF(to_monitor)
 	li	v0, MIPS_SR_BEV			# no interrupt and
-	mtc0	v0, MIPS_COP_0_STATUS_REG	# boot strap exception vector
+	mtc0	v0, MIPS_COP_0_STATUS		# boot strap exception vector
 	nop
 	nop
 	nop
diff --git a/sys/arch/pmax/pmax/locore_machdep.S b/sys/arch/pmax/pmax/locore_machdep.S
index 3c7f796ad167..c7af6fa6c88a 100644
--- a/sys/arch/pmax/pmax/locore_machdep.S
+++ b/sys/arch/pmax/pmax/locore_machdep.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_machdep.S,v 1.18 2001/08/27 02:00:19 nisimura Exp $	*/
+/*	$NetBSD: locore_machdep.S,v 1.19 2003/06/09 12:20:39 simonb Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -148,11 +148,11 @@ END(CopyFromBuffer)
 LEAF(dec_mips1_wbflush)
 ALEAF(kn230_wbflush)
 ALEAF(kn210_wbflush)
-        mfc0	v0, MIPS_COP_0_STATUS_REG	# save original SR in v0
+        mfc0	v0, MIPS_COP_0_STATUS		# save original SR in v0
 	li	t0, 0x80000000			# set CU3 bit
 	or	v1, v0 ,t0			# v1 = v0 | 0x80000000
 	nop
-	mtc0	v1, MIPS_COP_0_STATUS_REG
+	mtc0	v1, MIPS_COP_0_STATUS
 	nop				/* two  more cycles to complete */
  	nop
 
@@ -160,7 +160,7 @@ ALEAF(kn210_wbflush)
 	bc3f    1b				# until write buffer drained
         nop                     		# (branch delay slot)
 
-        mtc0    v0, MIPS_COP_0_STATUS_REG	# restore SR on exit
+        mtc0    v0, MIPS_COP_0_STATUS		# restore SR on exit
         nop
         j       ra
         nop