1 files changed, 4 insertions, 32 deletions

diff --git a/arch/mips/mm/pgtable-32.c b/arch/mips/mm/pgtable-32.c
index 4f07f81e8500..4a3c4919e314 100644
--- a/arch/mips/mm/pgtable-32.c
+++ b/arch/mips/mm/pgtable-32.c
@@ -10,6 +10,7 @@
 #include <linux/mm.h>
 #include <linux/bootmem.h>
 #include <linux/highmem.h>
+#include <asm/fixmap.h>
 #include <asm/pgtable.h>
 
 void pgd_init(unsigned long page)
@@ -29,42 +30,12 @@ void pgd_init(unsigned long page)
         }
 }
 
-#ifdef CONFIG_HIGHMEM
-static void __init fixrange_init (unsigned long start, unsigned long end,
-        pgd_t *pgd_base)
-{
-        pgd_t *pgd;
-        pmd_t *pmd;
-        pte_t *pte;
-        int i, j;
-        unsigned long vaddr;
-
-        vaddr = start;
-        i = __pgd_offset(vaddr);
-        j = __pmd_offset(vaddr);
-        pgd = pgd_base + i;
-
-        for ( ; (i < PTRS_PER_PGD) && (vaddr != end); pgd++, i++) {
-                pmd = (pmd_t *)pgd;
-                for (; (j < PTRS_PER_PMD) && (vaddr != end); pmd++, j++) {
-                        if (pmd_none(*pmd)) {
-                                pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
-                                set_pmd(pmd, __pmd((unsigned long)pte));
-                                if (pte != pte_offset_kernel(pmd, 0))
-                                        BUG();
-                        }
-                        vaddr += PMD_SIZE;
-                }
-                j = 0;
-        }
-}
-#endif
-
 void __init pagetable_init(void)
 {
 #ifdef CONFIG_HIGHMEM
         unsigned long vaddr;
         pgd_t *pgd, *pgd_base;
+        pud_t *pud;
         pmd_t *pmd;
         pte_t *pte;
 #endif
@@ -90,7 +61,8 @@ void __init pagetable_init(void)
         fixrange_init(vaddr, vaddr + PAGE_SIZE*LAST_PKMAP, pgd_base);
 
         pgd = swapper_pg_dir + __pgd_offset(vaddr);
-        pmd = pmd_offset(pgd, vaddr);
+        pud = pud_offset(pgd, vaddr);
+        pmd = pmd_offset(pud, vaddr);
         pte = pte_offset_kernel(pmd, vaddr);
         pkmap_page_table = pte;
 #endif