summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorandreast <andreast@FreeBSD.org>2011-06-23 09:46:12 +0000
committerandreast <andreast@FreeBSD.org>2011-06-23 09:46:12 +0000
commitb7eb040870f8f7f13c02782685f7c8da18ca0f5c (patch)
tree9efd640cc3b570f2b17bfc04f310038e9b52fbb9 /sys
parent98422c10357e3e12f390963faabf5209359c225e (diff)
downloadFreeBSD-src-b7eb040870f8f7f13c02782685f7c8da18ca0f5c.zip
FreeBSD-src-b7eb040870f8f7f13c02782685f7c8da18ca0f5c.tar.gz
Fix merge typo.
Diffstat (limited to 'sys')
-rw-r--r--sys/powerpc/aim/mmu_oea64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c
index 291d89b..8f4028f 100644
--- a/sys/powerpc/aim/mmu_oea64.c
+++ b/sys/powerpc/aim/mmu_oea64.c
@@ -1715,7 +1715,7 @@ moea64_kextract(mmu_t mmu, vm_offset_t va)
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);
}
OpenPOWER on IntegriCloud