From owner-p4-projects@FreeBSD.ORG  Sun May 20 16:20:52 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 65EFA1065670; Sun, 20 May 2012 16:20:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 28D4D106566B
	for <perforce@freebsd.org>; Sun, 20 May 2012 16:20:52 +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 C9C508FC08
	for <perforce@freebsd.org>; Sun, 20 May 2012 16:20:51 +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 q4KGKpvD088989
	for <perforce@freebsd.org>; Sun, 20 May 2012 16:20:51 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 q4KGKpTt088985
	for perforce@freebsd.org; Sun, 20 May 2012 16:20:51 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 20 May 2012 16:20:51 GMT
Message-Id: <201205201620.q4KGKpTt088985@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 211438 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: Sun, 20 May 2012 16:20:52 -0000

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

Change 211438 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/20 16:20:41

	Insert a restoration of userspace $c0 before another instance
	of eret.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/swtch.S#3 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/swtch.S#3 (text+ko) ====

@@ -162,6 +162,9 @@
 	mtc0	k0, MIPS_COP_0_STATUS	# switch to user mode (when eret...)
 	HAZARD_DELAY
 	sync
+#ifdef CPU_CHERI
+	cmove		$c0, $c27	# Restore user data segment
+#endif
 	eret
 	.set	at
 END(fork_trampoline)