Module Name: src
Committed By: matt
Date: Tue Jun 2 05:09:15 UTC 2015
Modified Files:
src/sys/arch/mips/mips: locore_mips3.S
Log Message:
In cpu_trampoline, load the ksp from the idlelwp after we enable KX.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/mips/mips/locore_mips3.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/locore_mips3.S
diff -u src/sys/arch/mips/mips/locore_mips3.S:1.103 src/sys/arch/mips/mips/locore_mips3.S:1.104
--- src/sys/arch/mips/mips/locore_mips3.S:1.103 Mon Jun 1 22:55:13 2015
+++ src/sys/arch/mips/mips/locore_mips3.S Tue Jun 2 05:09:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_mips3.S,v 1.103 2015/06/01 22:55:13 matt Exp $ */
+/* $NetBSD: locore_mips3.S,v 1.104 2015/06/02 05:09:15 matt Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -729,8 +729,6 @@ NESTED_NOPROFILE(cpu_trampoline, 0, ra)
nop
PTR_S MIPS_CURLWP, CPU_INFO_CURLWP(a0)
- PTR_L sp, L_MD_UTF(MIPS_CURLWP) # fetch KSP
-
#ifdef _LP64
li v0, MIPS_SR_KX | MIPS_SR_UX # allow 64bit addressing
#else
@@ -739,6 +737,8 @@ NESTED_NOPROFILE(cpu_trampoline, 0, ra)
mtc0 v0, MIPS_COP_0_STATUS # reset to known state
COP0_SYNC
+ PTR_L sp, L_MD_UTF(MIPS_CURLWP) # fetch KSP
+
/*
* Indicate that no one has called us.
*/
@@ -752,6 +752,13 @@ NESTED_NOPROFILE(cpu_trampoline, 0, ra)
PTR_LA gp, _C_LABEL(_gp)
#endif
+#if 0
+ LONG_L t0, CPU_INFO_FLAGS(a0)
+ or t0, t0, CPUF_PRESENT
+ LONG_S t0, CPU_INFO_FLAGS(a0)
+ sync
+#endif
+
/*
* and off we go.
*/
