From owner-svn-src-user@FreeBSD.ORG  Sat Apr 17 03:14:01 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1590F1065674;
	Sat, 17 Apr 2010 03:14:01 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 04B728FC1C;
	Sat, 17 Apr 2010 03:14:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3H3E0Av030103;
	Sat, 17 Apr 2010 03:14:00 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3H3E0p2030101;
	Sat, 17 Apr 2010 03:14:00 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004170314.o3H3E0p2030101@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sat, 17 Apr 2010 03:14:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206722 - user/jmallett/octeon/sys/mips/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Apr 2010 03:14:01 -0000

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)