From owner-p4-projects@FreeBSD.ORG  Mon Mar  3 15:19:31 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 50FFE1065671; Mon,  3 Mar 2008 15:19:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 10E71106566C
	for <perforce@freebsd.org>; Mon,  3 Mar 2008 15:19:31 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0FC8D8FC2A
	for <perforce@freebsd.org>; Mon,  3 Mar 2008 15:19:31 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m23FJUgF051175
	for <perforce@freebsd.org>; Mon, 3 Mar 2008 15:19:30 GMT
	(envelope-from rrs@cisco.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m23FJU3W051173
	for perforce@freebsd.org; Mon, 3 Mar 2008 15:19:30 GMT
	(envelope-from rrs@cisco.com)
Date: Mon, 3 Mar 2008 15:19:30 GMT
Message-Id: <200803031519.m23FJU3W051173@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rrs@cisco.com using -f
From: "Randall R. Stewart" <rrs@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 136746 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Mar 2008 15:19:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=136746

Change 136746 by rrs@rrs-mips2-jnpr on 2008/03/03 15:18:31

	Make INT enable apply to others too

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#18 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#18 (text+ko) ====

@@ -544,8 +544,9 @@
 	RESTORE_U_PCB_REG(ra, RA, k1)
 #ifdef TARGET_OCTEON
 	and k0, k0, ~(MIPS_SR_KX | MIPS_SR_SX | MIPS_SR_UX)
+#endif
 	or  k0, k0, MIPS_SR_INT_IE
-#endif
+
 	.set noat
 	RESTORE_U_PCB_REG(AT, AST, k1)
 
@@ -765,8 +766,8 @@
 	RESTORE_U_PCB_REG(ra, RA, k1)
 #ifdef TARGET_OCTEON
 	and k0, k0, ~(MIPS_SR_KX | MIPS_SR_SX | MIPS_SR_UX)
+#endif
 	or  k0, k0, MIPS_SR_INT_IE
-#endif
 	.set	noat
 	RESTORE_U_PCB_REG(AT, AST, k1)