Module Name: src
Committed By: matt
Date: Sun Aug 9 22:24:53 UTC 2009
Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S
Log Message:
If using 16KB pages and VMSWAP_UAREA isn't defined, then cpu_switch_resume
becomes a empty routine since the UAREA is now mapped via KSEG0 instead of
via TLB.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 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.30 src/sys/arch/mips/mips/mipsX_subr.S:1.31
--- src/sys/arch/mips/mips/mipsX_subr.S:1.30 Sun Aug 9 05:36:22 2009
+++ src/sys/arch/mips/mips/mipsX_subr.S Sun Aug 9 22:24:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mipsX_subr.S,v 1.30 2009/08/09 05:36:22 matt Exp $ */
+/* $NetBSD: mipsX_subr.S,v 1.31 2009/08/09 22:24:53 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -119,6 +119,7 @@
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_mips3_wired.h"
+#include "opt_vmswap.h"
#include <sys/cdefs.h>
@@ -2045,6 +2046,7 @@
* sure TBIS(it) in the case.
*/
LEAF_NOPROFILE(MIPSX(cpu_switch_resume))
+#if !defined(ENABLE_MIPS_16KB_PAGE) || defined(VMSWAP_UAREA)
lw a1, L_MD_UPTE_0(a0) # a1 = upte[0]
lw a2, L_MD_UPTE_1(a0) # a2 = upte[1]
lw v0, L_ADDR(a0) # va = l->l_addr
@@ -2103,6 +2105,7 @@
nop
resume:
+#endif /* !ENABLE_MIPS_16KB_PAGE || VMSWAP_UAREA */
j ra
nop
END(MIPSX(cpu_switch_resume))
