From owner-svn-src-projects@FreeBSD.ORG  Fri Sep 11 15:31:14 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 06221106566B;
	Fri, 11 Sep 2009 15:31:14 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EA2908FC16;
	Fri, 11 Sep 2009 15:31:13 +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 n8BFVD8w055882;
	Fri, 11 Sep 2009 15:31:13 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8BFVD3t055880;
	Fri, 11 Sep 2009 15:31:13 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200909111531.n8BFVD3t055880@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 11 Sep 2009 15:31:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197090 - projects/ppc64/sys/powerpc/aim64
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Sep 2009 15:31:14 -0000

Author: nwhitehorn
Date: Fri Sep 11 15:31:13 2009
New Revision: 197090
URL: http://svn.freebsd.org/changeset/base/197090

Log:
  Use a more rational scheme to restore the USER_SR SLB bits.

Modified:
  projects/ppc64/sys/powerpc/aim64/swtch.S

Modified: projects/ppc64/sys/powerpc/aim64/swtch.S
==============================================================================
--- projects/ppc64/sys/powerpc/aim64/swtch.S	Fri Sep 11 15:07:36 2009	(r197089)
+++ projects/ppc64/sys/powerpc/aim64/swtch.S	Fri Sep 11 15:31:13 2009	(r197090)
@@ -200,10 +200,15 @@ cpu_switchin:
 	mtcr	%r5
 	ld	%r5,PCB_LR(%r3)		/* Load the link register */
 	mtlr	%r5
-	ld	%r5,PCB_AIM_USR_VSID(%r3) /* Load the USER_SR segment reg */
+
+	li	%r5,USER_SR		/* Load the USER_SR segment reg */
+	sldi	%r5,%r5,28
+	slbie	%r5
+	ld	%r5,PCB_AIM_USR_VSID(%r3)
 	ld	%r6,PCB_AIM_USR_ESID(%r3)
 	ori	%r6,%r6,USER_SR
 	slbmte	%r5,%r6
+
 	isync
 	ld	%r1,PCB_SP(%r3)		/* Load the stack pointer */
 	ld	%r2,PCB_TOC(%r3)	/* Load the TOC pointer */