svn commit: r231804 - in projects/pseries/powerpc: include pseries

[Nathan Whitehorn]

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 */