svn commit: r206722 - user/jmallett/octeon/sys/mips/mips

[Juli Mallett]

Author: jmallett
Date: Sat Apr 17 03:14:00 2010
New Revision: 206722
URL: http://svn.freebsd.org/changeset/base/206722

Log:
  Merge from head (loopback my remaining Octeon subport changes.)

Modified:
  user/jmallett/octeon/sys/mips/mips/mpboot.S
Directory Properties:
  user/jmallett/octeon/   (props changed)
  user/jmallett/octeon/sys/contrib/x86emu/   (props changed)

Modified: user/jmallett/octeon/sys/mips/mips/mpboot.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/mpboot.S	Sat Apr 17 03:08:13 2010	(r206721)
+++ user/jmallett/octeon/sys/mips/mips/mpboot.S	Sat Apr 17 03:14:00 2010	(r206722)
@@ -46,10 +46,7 @@
         mtc0    a0, COP_0_STATUS_REG    
 #else
 #define CLEAR_STATUS \
-	mfc0    a0, COP_0_STATUS_REG    ;\
-	li      a2, ~(MIPS_SR_INT_IE | MIPS_SR_EXL | SR_KSU_USER)   ; \
-	and     a0, a0, a2              ; \
-	mtc0	a0, COP_0_STATUS_REG
+	mtc0	zero, COP_0_STATUS_REG
 #endif
 
 GLOBAL(mpentry)