Module Name: src
Committed By: matt
Date: Sat Jun 27 03:29:09 UTC 2015
Modified Files:
src/sys/arch/mips/mips: spl.S
Log Message:
Turn KX (no need for UX) when !O32 ABI and MULTIPROCESSOR
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/mips/spl.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/spl.S
diff -u src/sys/arch/mips/mips/spl.S:1.9 src/sys/arch/mips/mips/spl.S:1.10
--- src/sys/arch/mips/mips/spl.S:1.9 Thu Jun 11 07:30:10 2015
+++ src/sys/arch/mips/mips/spl.S Sat Jun 27 03:29:09 2015
@@ -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 @@ _splraise:
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
