diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-12 19:50:03 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 19:50:03 +0200 |
commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /include/asm-mips/pgtable-64.h | |
parent | [POWERPC] 85xx: Add initial MPC8544DS basic port defconfig. (diff) | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
download | linux-e049d1ca3094f3d1d94617f456a9961202f96e3a.tar.xz linux-e049d1ca3094f3d1d94617f456a9961202f96e3a.zip |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'include/asm-mips/pgtable-64.h')
-rw-r--r-- | include/asm-mips/pgtable-64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/pgtable-64.h b/include/asm-mips/pgtable-64.h index a5b18710b6a4..49f5a1a2dfcd 100644 --- a/include/asm-mips/pgtable-64.h +++ b/include/asm-mips/pgtable-64.h @@ -199,7 +199,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud) { return pud_val(pud); } -#define pud_phys(pud) (pud_val(pud) - PAGE_OFFSET) +#define pud_phys(pud) virt_to_phys((void *)pud_val(pud)) #define pud_page(pud) (pfn_to_page(pud_phys(pud) >> PAGE_SHIFT)) /* Find an entry in the second-level page table.. */ |