diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c
index c1f4f71c268..0ebc79075eb 100644
--- a/sys/powerpc/aim/mmu_oea64.c
+++ b/sys/powerpc/aim/mmu_oea64.c
@@ -202,30 +202,45 @@ static u_int	moea64_vsid_bitmap[NVSIDS / VSID_NBPW];
 static boolean_t moea64_initialized = FALSE;
 
 /*
  * Statistics.
  */
 u_int	moea64_pte_valid = 0;
 u_int	moea64_pte_overflow = 0;
 u_int	moea64_pvo_entries = 0;
 u_int	moea64_pvo_enter_calls = 0;
 u_int	moea64_pvo_remove_calls = 0;
+u_long	moea64_enter_1 = 0;
+u_long	moea64_enter_2 = 0;
+u_long	moea64_enter_3 = 0;
+u_long	moea64_enter_4 = 0;
+u_long	moea64_enter_5 = 0;
 SYSCTL_INT(_machdep, OID_AUTO, moea64_pte_valid, CTLFLAG_RD, 
     &moea64_pte_valid, 0, "");
 SYSCTL_INT(_machdep, OID_AUTO, moea64_pte_overflow, CTLFLAG_RD,
     &moea64_pte_overflow, 0, "");
 SYSCTL_INT(_machdep, OID_AUTO, moea64_pvo_entries, CTLFLAG_RD, 
     &moea64_pvo_entries, 0, "");
 SYSCTL_INT(_machdep, OID_AUTO, moea64_pvo_enter_calls, CTLFLAG_RD,
     &moea64_pvo_enter_calls, 0, "");
 SYSCTL_INT(_machdep, OID_AUTO, moea64_pvo_remove_calls, CTLFLAG_RD,
     &moea64_pvo_remove_calls, 0, "");
+SYSCTL_ULONG(_machdep, OID_AUTO, moea64_enter_1, CTLFLAG_RD,
+    &moea64_enter_1, 0, "");
+SYSCTL_ULONG(_machdep, OID_AUTO, moea64_enter_2, CTLFLAG_RD,
+    &moea64_enter_2, 0, "");
+SYSCTL_ULONG(_machdep, OID_AUTO, moea64_enter_3, CTLFLAG_RD,
+    &moea64_enter_3, 0, "");
+SYSCTL_ULONG(_machdep, OID_AUTO, moea64_enter_4, CTLFLAG_RD,
+    &moea64_enter_4, 0, "");
+SYSCTL_ULONG(_machdep, OID_AUTO, moea64_enter_5, CTLFLAG_RD,
+    &moea64_enter_5, 0, "");
 
 vm_offset_t	moea64_scratchpage_va[2];
 struct pvo_entry *moea64_scratchpage_pvo[2];
 struct	mtx	moea64_scratchpage_mtx;
 
 uint64_t 	moea64_large_page_mask = 0;
 uint64_t	moea64_large_page_size = 0;
 int		moea64_large_page_shift = 0;
 
 /*
@@ -1388,22 +1403,24 @@ moea64_quick_remove_page(mmu_t mmu, vm_offset_t addr)
 
 int
 moea64_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m, 
     vm_prot_t prot, u_int flags, int8_t psind)
 {
 	struct		pvo_entry *pvo, *oldpvo;
 	struct		pvo_head *pvo_head;
 	uint64_t	pte_lo;
 	int		error;
 
+#ifdef INVARIANTS
 	if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m))
 		VM_OBJECT_ASSERT_LOCKED(m->object);
+#endif
 
 	pvo = alloc_pvo_entry(0);
 	pvo->pvo_pmap = NULL; /* to be filled in later */
 	pvo->pvo_pte.prot = prot;
 
 	pte_lo = moea64_calc_wimg(VM_PAGE_TO_PHYS(m), pmap_page_get_memattr(m));
 	pvo->pvo_pte.pa = VM_PAGE_TO_PHYS(m) | pte_lo;
 
 	if ((flags & PMAP_ENTER_WIRED) != 0)
 		pvo->pvo_vaddr |= PVO_WIRED;
@@ -1411,35 +1428,38 @@ moea64_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m,
 	if ((m->oflags & VPO_UNMANAGED) != 0 || !moea64_initialized) {
 		pvo_head = NULL;
 	} else {
 		pvo_head = &m->md.mdpg_pvoh;
 		pvo->pvo_vaddr |= PVO_MANAGED;
 	}
 	
 	for (;;) {
 		PV_PAGE_LOCK(m);
 		PMAP_LOCK(pmap);
-		if (pvo->pvo_pmap == NULL)
+		if (pvo->pvo_pmap == NULL) {
+			moea64_enter_1++;
 			init_pvo_entry(pvo, pmap, va);
+		}
 		if (prot & VM_PROT_WRITE)
 			if (pmap_bootstrapped &&
 			    (m->oflags & VPO_UNMANAGED) == 0)
 				vm_page_aflag_set(m, PGA_WRITEABLE);
 
 		//oldpvo = moea64_pvo_find_va(pmap, va);
 		oldpvo = moea64_pvo_enter(mmu, pvo, pvo_head, &error);
 		if (oldpvo != NULL) {
 			if (oldpvo->pvo_vaddr == pvo->pvo_vaddr &&
 			    oldpvo->pvo_pte.pa == pvo->pvo_pte.pa &&
 			    oldpvo->pvo_pte.prot == prot) {
 				/* Identical mapping already exists */
 				error = 0;
+moea64_enter_2++;
 
 				/* If not in page table, reinsert it */
 				if (MOEA64_PTE_SYNCH(mmu, oldpvo) < 0) {
 					moea64_pte_overflow--;
 					MOEA64_PTE_INSERT(mmu, oldpvo);
 				}
 
 				/* Then just clean up and go home */
 				PV_PAGE_UNLOCK(m);
 				PMAP_UNLOCK(pmap);
@@ -1451,41 +1471,44 @@ moea64_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m,
 			KASSERT(oldpvo->pvo_pmap == pmap, ("pmap of old "
 			    "mapping does not match new mapping"));
 			moea64_pvo_remove_from_pmap(mmu, oldpvo);
 			moea64_pvo_enter(mmu, pvo, pvo_head, &error);
 		}
 		PV_PAGE_UNLOCK(m);
 		PMAP_UNLOCK(pmap);
 
 		/* Free any dead pages */
 		if (oldpvo != NULL) {
+moea64_enter_3++;
 			moea64_pvo_remove_from_page(mmu, oldpvo);
 			free_pvo_entry(oldpvo);
 		}
 
 		if (error != ENOMEM)
 			break;
 		if ((flags & PMAP_ENTER_NOSLEEP) != 0)
 			return (KERN_RESOURCE_SHORTAGE);
 		VM_OBJECT_ASSERT_UNLOCKED(m->object);
 		vm_wait(NULL);
 	}
 
 	/*
 	 * Flush the page from the instruction cache if this page is
 	 * mapped executable and cacheable.
 	 */
 	if (pmap != kernel_pmap && !(m->aflags & PGA_EXECUTABLE) &&
 	    (pte_lo & (LPTE_I | LPTE_G | LPTE_NOEXEC)) == 0) {
+		moea64_enter_4++;
 		vm_page_aflag_set(m, PGA_EXECUTABLE);
 		moea64_syncicache(mmu, pmap, va, VM_PAGE_TO_PHYS(m), PAGE_SIZE);
 	}
+	moea64_enter_5++;
 	return (KERN_SUCCESS);
 }
 
 static void
 moea64_syncicache(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_paddr_t pa,
     vm_size_t sz)
 {
 
 	/*
 	 * This is much trickier than on older systems because