diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 22:17:26 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 22:17:26 +0000 |
| commit | 984760dbf5e48f6224dfe9e26e03536b3d38b6cd (patch) | |
| tree | a99674322e524c4c90009b3bdae5fab0eebf2094 /include/asm-mips64/pgtable.h | |
| parent | a7ce7d5e94c98ef5b867f61b2ebecd563f4b6ec9 (diff) | |
Merge with Linux 2.4.0-test6-pre8.
Diffstat (limited to 'include/asm-mips64/pgtable.h')
| -rw-r--r-- | include/asm-mips64/pgtable.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-mips64/pgtable.h b/include/asm-mips64/pgtable.h index ccabdb171..42cdcab75 100644 --- a/include/asm-mips64/pgtable.h +++ b/include/asm-mips64/pgtable.h @@ -241,7 +241,7 @@ extern unsigned long zero_page_mask; #define BAD_PMDTABLE __bad_pmd_table() #define BAD_PAGE __bad_page() #define ZERO_PAGE(vaddr) \ - (mem_map + MAP_NR(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask))) + (virt_to_page(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask))) /* number of bits that fit into a memory pointer */ #define BITS_PER_PTR (8*sizeof(unsigned long)) @@ -354,13 +354,13 @@ extern inline void pgd_clear(pgd_t *pgdp) */ #define page_address(page) ((page)->virtual) #ifndef CONFIG_DISCONTIGMEM -#define pte_pagenr(x) ((unsigned long)((pte_val(x) >> PAGE_SHIFT))) +#define pte_page(x) (mem_map+(unsigned long)((pte_val(x) >> PAGE_SHIFT))) #else -#define pte_pagenr(x) \ +#define mips64_pte_pagenr(x) \ (PLAT_NODE_DATA_STARTNR(PHYSADDR_TO_NID(pte_val(x))) + \ PLAT_NODE_DATA_LOCALNR(pte_val(x), PHYSADDR_TO_NID(pte_val(x)))) -#endif #define pte_page(x) (mem_map+pte_pagenr(x)) +#endif /* * The following only work if pte_present() is true. |