svn commit: r223471 - head/sys/powerpc/aim

Andreas Tobler andreast at FreeBSD.org
Thu Jun 23 09:46:12 UTC 2011


Author: andreast
Date: Thu Jun 23 09:46:12 2011
New Revision: 223471
URL: http://svn.freebsd.org/changeset/base/223471

Log:
  Fix merge typo.

Modified:
  head/sys/powerpc/aim/mmu_oea64.c

Modified: head/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea64.c	Thu Jun 23 09:43:53 2011	(r223470)
+++ head/sys/powerpc/aim/mmu_oea64.c	Thu Jun 23 09:46:12 2011	(r223471)
@@ -1715,7 +1715,7 @@ moea64_kextract(mmu_t mmu, vm_offset_t v
 	pvo = moea64_pvo_find_va(kernel_pmap, va);
 	KASSERT(pvo != NULL, ("moea64_kextract: no addr found for %#" PRIxPTR,
 	    va));
-	pa = (pvo->pvo_pte.lpte.pte_lo & LPTE_RPGN) + (va - PVO_VADDR(pvo));
+	pa = (pvo->pvo_pte.lpte.pte_lo & LPTE_RPGN) | (va - PVO_VADDR(pvo));
 	PMAP_UNLOCK(kernel_pmap);
 	return (pa);
 }


More information about the svn-src-all mailing list