From owner-p4-projects@FreeBSD.ORG  Tue Feb 14 10:36:47 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9099310657A6; Tue, 14 Feb 2012 10:36:47 +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 3F622106578F
	for <perforce@freebsd.org>; Tue, 14 Feb 2012 10:36:47 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 26B008FC0C
	for <perforce@freebsd.org>; Tue, 14 Feb 2012 10:36:47 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q1EAakmi035297
	for <perforce@freebsd.org>; Tue, 14 Feb 2012 10:36:46 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q1EAak1L035294
	for perforce@freebsd.org; Tue, 14 Feb 2012 10:36:46 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 14 Feb 2012 10:36:46 GMT
Message-Id: <201202141036.q1EAak1L035294@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 206264 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 14 Feb 2012 10:36:47 -0000

http://p4web.freebsd.org/@@206264?ac=10

Change 206264 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/02/14 10:36:03

	On 64-bit MIPS CPUs, set 64-bit mode for the supervisor ring, not
	just the kernel and user rings.  On traditional 64-bit MIPS
	processors, this isn't an issue, as FreeBSD doesn't use the
	supervisor ring, so this becomes a no-op.  However, CHERI rejects
	attempts to clear 64-bit mode flags for rings, including SX,
	throwing an exception, as 32-bit mode is not supported for any
	ring.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/mips/locore.S#2 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/mips/locore.S#2 (text+ko) ====

@@ -118,7 +118,7 @@
 	 */
 	li	t1, MIPS_SR_COP_1_BIT
 #ifdef __mips_n64
-	or	t1, MIPS_SR_KX | MIPS_SR_UX
+	or	t1, MIPS_SR_KX | MIPS_SR_SX | MIPS_SR_UX
 #endif
 #endif
 	/*