[src/trunk]: src/sys/arch/mips/mips Turn KX (no need for UX) when !O32 ABI an...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8915e9c79c55
branches:  trunk
changeset: 339108:8915e9c79c55
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Jun 27 03:29:09 2015 +0000

description:
Turn KX (no need for UX) when !O32 ABI and MULTIPROCESSOR

diffstat:

 sys/arch/mips/mips/spl.S |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 02f6b94b107b -r 8915e9c79c55 sys/arch/mips/mips/spl.S
--- a/sys/arch/mips/mips/spl.S  Fri Jun 26 22:56:36 2015 +0000
+++ b/sys/arch/mips/mips/spl.S  Sat Jun 27 03:29:09 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spl.S,v 1.9 2015/06/11 07:30:10 matt Exp $     */
+/*     $NetBSD: spl.S,v 1.10 2015/06/27 03:29:09 matt Exp $    */
 
 /*-
  * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 #include <mips/asm.h>
 #include <mips/cpuregs.h>
 
-RCSID("$NetBSD: spl.S,v 1.9 2015/06/11 07:30:10 matt Exp $")
+RCSID("$NetBSD: spl.S,v 1.10 2015/06/27 03:29:09 matt Exp $")
 
 #include "assym.h"
 
@@ -86,8 +86,8 @@
        or      v1, MIPS_INT_MASK               # enable all interrupts
        xor     a0, v1                          # disable ipl's masked bits
        DYNAMIC_STATUS_MASK(a0,v0)              # machine dependent masking
-#if defined(_LP64) && MULTIPROCESSOR
-       li      v1, MIPS3_SR_KX | MIPS3_SR_UX   # keep 64-bit addressing on
+#if !defined(__mips_o32) && defined(MULTIPROCESSOR)
+       li      v1, MIPS3_SR_KX                 # keep 64-bit addressing on
        mtc0    v1, MIPS_COP_0_STATUS           ## disable interrupts
 #else
        mtc0    zero, MIPS_COP_0_STATUS         ## disable interrupts