diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-02-10 07:19:59 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:30:31 -0400 |
commit | c6e8b587718c486b55c2ebecc6de231a30beba35 (patch) | |
tree | 7c6162d449c69fb6425bd27ba341e2d874fb0a1b /arch/mips/lib-64/dump_tlb.c | |
parent | 57f0060b8a2bb2a70a4cce1a37d5e0158cea92a6 (diff) |
Update MIPS to use the 4-level pagetable code thereby getting rid of
the compacrapability headers.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/lib-64/dump_tlb.c')
-rw-r--r-- | arch/mips/lib-64/dump_tlb.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/mips/lib-64/dump_tlb.c b/arch/mips/lib-64/dump_tlb.c index 42f88e055b4c..11a5f015f040 100644 --- a/arch/mips/lib-64/dump_tlb.c +++ b/arch/mips/lib-64/dump_tlb.c | |||
@@ -140,6 +140,7 @@ void dump_tlb_nonwired(void) | |||
140 | void dump_list_process(struct task_struct *t, void *address) | 140 | void dump_list_process(struct task_struct *t, void *address) |
141 | { | 141 | { |
142 | pgd_t *page_dir, *pgd; | 142 | pgd_t *page_dir, *pgd; |
143 | pud_t *pud; | ||
143 | pmd_t *pmd; | 144 | pmd_t *pmd; |
144 | pte_t *pte, page; | 145 | pte_t *pte, page; |
145 | unsigned long addr, val; | 146 | unsigned long addr, val; |
@@ -155,7 +156,10 @@ void dump_list_process(struct task_struct *t, void *address) | |||
155 | pgd = pgd_offset(t->mm, addr); | 156 | pgd = pgd_offset(t->mm, addr); |
156 | printk("pgd == %016lx\n", (unsigned long) pgd); | 157 | printk("pgd == %016lx\n", (unsigned long) pgd); |
157 | 158 | ||
158 | pmd = pmd_offset(pgd, addr); | 159 | pud = pud_offset(pgd, addr); |
160 | printk("pud == %016lx\n", (unsigned long) pud); | ||
161 | |||
162 | pmd = pmd_offset(pud, addr); | ||
159 | printk("pmd == %016lx\n", (unsigned long) pmd); | 163 | printk("pmd == %016lx\n", (unsigned long) pmd); |
160 | 164 | ||
161 | pte = pte_offset(pmd, addr); | 165 | pte = pte_offset(pmd, addr); |
@@ -184,13 +188,15 @@ void dump_list_current(void *address) | |||
184 | unsigned int vtop(void *address) | 188 | unsigned int vtop(void *address) |
185 | { | 189 | { |
186 | pgd_t *pgd; | 190 | pgd_t *pgd; |
191 | pud_t *pud; | ||
187 | pmd_t *pmd; | 192 | pmd_t *pmd; |
188 | pte_t *pte; | 193 | pte_t *pte; |
189 | unsigned int addr, paddr; | 194 | unsigned int addr, paddr; |
190 | 195 | ||
191 | addr = (unsigned long) address; | 196 | addr = (unsigned long) address; |
192 | pgd = pgd_offset(current->mm, addr); | 197 | pgd = pgd_offset(current->mm, addr); |
193 | pmd = pmd_offset(pgd, addr); | 198 | pud = pud_offset(pgd, addr); |
199 | pmd = pmd_offset(pud, addr); | ||
194 | pte = pte_offset(pmd, addr); | 200 | pte = pte_offset(pmd, addr); |
195 | paddr = (CKSEG1 | (unsigned int) pte_val(*pte)) & PAGE_MASK; | 201 | paddr = (CKSEG1 | (unsigned int) pte_val(*pte)) & PAGE_MASK; |
196 | paddr |= (addr & ~PAGE_MASK); | 202 | paddr |= (addr & ~PAGE_MASK); |