Date: Thu, 23 Jun 2011 09:46:12 +0000 (UTC) From: Andreas Tobler <andreast@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r223471 - head/sys/powerpc/aim Message-ID: <201106230946.p5N9kC4H092388@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106230946.p5N9kC4H092388>