diff options
| author | Paul Mackerras <paulus@samba.org> | 2002-09-05 17:48:27 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@au1.ibm.com> | 2002-09-05 17:48:27 +1000 |
| commit | 1e7eceaf514e98c627c9f3c7af2cdbcfd5252953 (patch) | |
| tree | 49b05d8380228e7fc198a01675ca88d0bcad3669 /include | |
| parent | 0d2fe17dea10d430de94c9ddd7e0552086d0f473 (diff) | |
PPC32: use page_to_pfn instead of page - mem_map in a couple of places
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/io.h | 2 | ||||
| -rw-r--r-- | include/asm-ppc/pgalloc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h index 7c6ab482401c..5c9ad25c7e80 100644 --- a/include/asm-ppc/io.h +++ b/include/asm-ppc/io.h @@ -295,7 +295,7 @@ extern inline void * phys_to_virt(unsigned long address) /* * Change "struct page" to physical address. */ -#define page_to_phys(page) ((page - mem_map) << PAGE_SHIFT) +#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) #define page_to_bus(page) (page_to_phys(page) + PCI_DRAM_OFFSET) #endif /* __KERNEL__ */ diff --git a/include/asm-ppc/pgalloc.h b/include/asm-ppc/pgalloc.h index 29bc46775052..16f8cb22cf99 100644 --- a/include/asm-ppc/pgalloc.h +++ b/include/asm-ppc/pgalloc.h @@ -26,7 +26,7 @@ extern void pgd_free(pgd_t *pgd); #define pmd_populate_kernel(mm, pmd, pte) \ (pmd_val(*(pmd)) = __pa(pte)) #define pmd_populate(mm, pmd, pte) \ - (pmd_val(*(pmd)) = ((pte) - mem_map) << PAGE_SHIFT) + (pmd_val(*(pmd)) = (page_to_pfn(pte) << PAGE_SHIFT)) extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr); extern struct page *pte_alloc_one(struct mm_struct *mm, unsigned long addr); |