From owner-svn-src-projects@FreeBSD.ORG  Fri Sep 11 15:35:29 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 1FA4F106566C;
	Fri, 11 Sep 2009 15:35:29 +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 0FA798FC19;
	Fri, 11 Sep 2009 15:35:29 +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 n8BFZS77056018;
	Fri, 11 Sep 2009 15:35:28 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8BFZSVq056016;
	Fri, 11 Sep 2009 15:35:28 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200909111535.n8BFZSVq056016@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 11 Sep 2009 15:35:28 +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: r197091 - projects/ppc64/sys/powerpc/aim
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:35:29 -0000

Author: nwhitehorn
Date: Fri Sep 11 15:35:28 2009
New Revision: 197091
URL: http://svn.freebsd.org/changeset/base/197091

Log:
  Fix 64-bit copyin/out() routines to use constants instead of magic numbers
  when setting SLB entries.

Modified:
  projects/ppc64/sys/powerpc/aim/copyinout.c

Modified: projects/ppc64/sys/powerpc/aim/copyinout.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/copyinout.c	Fri Sep 11 15:31:13 2009	(r197090)
+++ projects/ppc64/sys/powerpc/aim/copyinout.c	Fri Sep 11 15:35:28 2009	(r197091)
@@ -87,8 +87,8 @@ set_user_sr(pmap_t pm, const void *addr)
 	vsid = va_to_vsid(pm, (vm_offset_t)addr);
 	PMAP_UNLOCK(pm);
 
-	slb1 = vsid << 12;
-	slb2 = (((esid << 1) | 1UL) << 27) | USER_SR;
+	slb1 = vsid << SLBV_VSID_SHIFT;
+	slb2 = (esid << SLBE_ESID_SHIFT) | SLBE_VALID | USER_SR;
 
 	__asm __volatile ("slbie %0; slbmte %1, %2" :: "r"(esid << 28),
 	    "r"(slb1), "r"(slb2));