diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
| commit | c226951b93f7cd7c3a10b17384535b617bd43fd0 (patch) | |
| tree | 07b8796a5c99fbbf587b8d0dbcbc173cfe5e381e /include/asm-mips/pgtable.h | |
| parent | b0df3bd1e553e901ec7297267611a5db88240b38 (diff) | |
| parent | e8216dee838c09776680a6f1a2e54d81f3cdfa14 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-mips/pgtable.h')
| -rw-r--r-- | include/asm-mips/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h index a36ca1be17f2..1ca4d1e185c7 100644 --- a/include/asm-mips/pgtable.h +++ b/include/asm-mips/pgtable.h | |||
| @@ -87,7 +87,7 @@ extern void paging_init(void); | |||
| 87 | */ | 87 | */ |
| 88 | #define pmd_phys(pmd) (pmd_val(pmd) - PAGE_OFFSET) | 88 | #define pmd_phys(pmd) (pmd_val(pmd) - PAGE_OFFSET) |
| 89 | #define pmd_page(pmd) (pfn_to_page(pmd_phys(pmd) >> PAGE_SHIFT)) | 89 | #define pmd_page(pmd) (pfn_to_page(pmd_phys(pmd) >> PAGE_SHIFT)) |
| 90 | #define pmd_page_kernel(pmd) pmd_val(pmd) | 90 | #define pmd_page_vaddr(pmd) pmd_val(pmd) |
| 91 | 91 | ||
| 92 | #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) | 92 | #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) |
| 93 | 93 | ||