diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-04-15 15:52:30 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-16 17:46:14 -0400 |
commit | af892e0f9fad390669494e389aed29b968ab7fdb (patch) | |
tree | 7230c0fccb54ad00aaa7dbc7b04e38f239a6496c | |
parent | b18796d32a35ca4d996c584c3bb6d0a4f8a7d310 (diff) |
[POWERPC] Cleanup pgtable-ppc32.h
* Removed defines KERNEL_PGD_PTRS & USER_PGD_PTRS since they aren't
used anywhere
* Changed pmd_page macro to use pfn_to_page so we get proper behavior
if ARCH_PFN_OFFSET is set as well if we use a different memory model
on ppc32.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | include/asm-powerpc/pgtable-ppc32.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-powerpc/pgtable-ppc32.h b/include/asm-powerpc/pgtable-ppc32.h index bd5b4011c53b..daea7692d070 100644 --- a/include/asm-powerpc/pgtable-ppc32.h +++ b/include/asm-powerpc/pgtable-ppc32.h | |||
@@ -98,9 +98,6 @@ extern int icache_44x_need_flush; | |||
98 | #define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE) | 98 | #define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE) |
99 | #define FIRST_USER_ADDRESS 0 | 99 | #define FIRST_USER_ADDRESS 0 |
100 | 100 | ||
101 | #define USER_PGD_PTRS (PAGE_OFFSET >> PGDIR_SHIFT) | ||
102 | #define KERNEL_PGD_PTRS (PTRS_PER_PGD-USER_PGD_PTRS) | ||
103 | |||
104 | #define pte_ERROR(e) \ | 101 | #define pte_ERROR(e) \ |
105 | printk("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \ | 102 | printk("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \ |
106 | (unsigned long long)pte_val(e)) | 103 | (unsigned long long)pte_val(e)) |
@@ -693,7 +690,7 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, | |||
693 | #define pmd_page_vaddr(pmd) \ | 690 | #define pmd_page_vaddr(pmd) \ |
694 | ((unsigned long) (pmd_val(pmd) & PAGE_MASK)) | 691 | ((unsigned long) (pmd_val(pmd) & PAGE_MASK)) |
695 | #define pmd_page(pmd) \ | 692 | #define pmd_page(pmd) \ |
696 | (mem_map + (__pa(pmd_val(pmd)) >> PAGE_SHIFT)) | 693 | pfn_to_page((__pa(pmd_val(pmd)) >> PAGE_SHIFT)) |
697 | #endif | 694 | #endif |
698 | 695 | ||
699 | /* to find an entry in a kernel page-table-directory */ | 696 | /* to find an entry in a kernel page-table-directory */ |