Module Name: src
Committed By: matt
Date: Wed Aug 18 06:35:01 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: locore.S locore_mips3.S
Log Message:
Set SR UX when we first set KX. (XLS416 now boot multiuser again with
>32 bit VAs).
To generate a diff of this commit:
cvs rdiff -u -r1.167.38.19 -r1.167.38.20 src/sys/arch/mips/mips/locore.S
cvs rdiff -u -r1.93.38.10 -r1.93.38.11 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.S
diff -u src/sys/arch/mips/mips/locore.S:1.167.38.19 src/sys/arch/mips/mips/locore.S:1.167.38.20
--- src/sys/arch/mips/mips/locore.S:1.167.38.19 Mon Aug 16 17:58:43 2010
+++ src/sys/arch/mips/mips/locore.S Wed Aug 18 06:35:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.167.38.19 2010/08/16 17:58:43 matt Exp $ */
+/* $NetBSD: locore.S,v 1.167.38.20 2010/08/18 06:35:01 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -102,7 +102,7 @@
#ifdef NOFPU /* No FPU; avoid touching FPU registers */
#ifdef _LP64
- li t0, MIPS_SR_KX # turn on XKSEG and XKPHYS
+ li t0, MIPS_SR_KX | MIPS_SR_UX # turn on XKSEG and XKPHYS
#else
li t0, 0 # Disable interrupts and
#endif
Index: src/sys/arch/mips/mips/locore_mips3.S
diff -u src/sys/arch/mips/mips/locore_mips3.S:1.93.38.10 src/sys/arch/mips/mips/locore_mips3.S:1.93.38.11
--- src/sys/arch/mips/mips/locore_mips3.S:1.93.38.10 Mon Aug 16 17:57:10 2010
+++ src/sys/arch/mips/mips/locore_mips3.S Wed Aug 18 06:35:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_mips3.S,v 1.93.38.10 2010/08/16 17:57:10 matt Exp $ */
+/* $NetBSD: locore_mips3.S,v 1.93.38.11 2010/08/18 06:35:01 matt Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -614,7 +614,7 @@
PTR_S MIPS_CURLWP, CPU_INFO_CURLWP(a0)
#ifdef _LP64
- li v0, MIPS_SR_KX # allow 64bit addressing
+ li v0, MIPS_SR_KX | MIPS_SR_UX # allow 64bit addressing
#else
li v0, 0
#endif
