From owner-svn-src-projects@FreeBSD.ORG  Thu Feb 16 02:02:00 2012
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 EA648106564A;
	Thu, 16 Feb 2012 02:02:00 +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 D94048FC0C;
	Thu, 16 Feb 2012 02:02:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1G220wq093299;
	Thu, 16 Feb 2012 02:02:00 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1G22033093296;
	Thu, 16 Feb 2012 02:02:00 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201202160202.q1G22033093296@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 16 Feb 2012 02:02:00 +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: r231804 - in projects/pseries/powerpc: include pseries
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: Thu, 16 Feb 2012 02:02:01 -0000

Author: nwhitehorn
Date: Thu Feb 16 02:02:00 2012
New Revision: 231804
URL: http://svn.freebsd.org/changeset/base/231804

Log:
  Follow the standard with a little more paranoia.

Modified:
  projects/pseries/powerpc/include/pte.h
  projects/pseries/powerpc/pseries/mmu_phyp.c

Modified: projects/pseries/powerpc/include/pte.h
==============================================================================
--- projects/pseries/powerpc/include/pte.h	Thu Feb 16 01:41:34 2012	(r231803)
+++ projects/pseries/powerpc/include/pte.h	Thu Feb 16 02:02:00 2012	(r231804)
@@ -96,8 +96,9 @@ struct lpteg {
 #define LPTE_VSID_SHIFT		12
 #define LPTE_AVPN_MASK		0xFFFFFFFFFFFFFF80ULL
 #define LPTE_API		0x0000000000000F80ULL
-#define LPTE_LOCKED		0x0000000000000010ULL
-#define LPTE_WIRED		0x0000000000000008ULL
+#define LPTE_SWBITS		0x0000000000000078ULL
+#define LPTE_WIRED		0x0000000000000010ULL
+#define LPTE_LOCKED		0x0000000000000008ULL
 #define LPTE_BIG		0x0000000000000004ULL	/* 4kb/16Mb page */
 #define LPTE_HID		0x0000000000000002ULL
 #define LPTE_VALID		0x0000000000000001ULL

Modified: projects/pseries/powerpc/pseries/mmu_phyp.c
==============================================================================
--- projects/pseries/powerpc/pseries/mmu_phyp.c	Thu Feb 16 01:41:34 2012	(r231803)
+++ projects/pseries/powerpc/pseries/mmu_phyp.c	Thu Feb 16 02:02:00 2012	(r231804)
@@ -262,7 +262,7 @@ mphyp_pte_spillable_ident(u_int ptegidx,
 		phyp_pft_hcall(H_READ, 0, slot, 0, 0, &pt.pte_hi, &pt.pte_lo,
 		    &junk);
 		
-		if (pt.pte_hi & (LPTE_LOCKED | LPTE_WIRED))
+		if (pt.pte_hi & LPTE_SWBITS)
 			continue;
 
 		/* This is a candidate, so remember it */