Module Name: src
Committed By: matt
Date: Tue Feb 22 08:19:47 UTC 2011
Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S
Log Message:
Always include mipsX_tlb_write_indexed.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/mips/mips/mipsX_subr.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/mips/mips/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.38 src/sys/arch/mips/mips/mipsX_subr.S:1.39
--- src/sys/arch/mips/mips/mipsX_subr.S:1.38 Sun Feb 20 07:45:48 2011
+++ src/sys/arch/mips/mips/mipsX_subr.S Tue Feb 22 08:19:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mipsX_subr.S,v 1.38 2011/02/20 07:45:48 matt Exp $ */
+/* $NetBSD: mipsX_subr.S,v 1.39 2011/02/22 08:19:47 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -2442,7 +2442,6 @@
nop
END(MIPSX(cpu_switch_resume))
-#if defined(ENABLE_MIPS3_WIRED_MAP)
/*--------------------------------------------------------------------------
*
* mipsN_tlb_write_indexed --
@@ -2502,7 +2501,6 @@
j ra
mtc0 v1, MIPS_COP_0_STATUS # Restore the status register
END(MIPSX(tlb_write_indexed))
-#endif /* ENABLE_MIPS3_WIRED_MAP */
#if defined(MIPS3)
/*----------------------------------------------------------------------------
@@ -2635,9 +2633,7 @@
PTR_WORD _C_LABEL(MIPSX(tlb_update))
PTR_WORD _C_LABEL(MIPSX(tlb_enter))
PTR_WORD _C_LABEL(MIPSX(tlb_read_indexed))
-#if defined(ENABLE_MIPS3_WIRED_MAP)
PTR_WORD _C_LABEL(MIPSX(tlb_write_indexed))
-#else
PTR_WORD _C_LABEL(nullop)
#endif
