CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/02/07 16:13:08

Modified files:
        arch/mips/mm   : init.c pgtable-32.c 
        include/asm-mips: fixmap.h 

Log message:
        Delete duplicate copy of fixrange_init.

diff -urN linux/arch/mips/mm/init.c linux/arch/mips/mm/init.c
--- linux/arch/mips/mm/init.c   2005/01/13 17:37:41     1.71
+++ linux/arch/mips/mm/init.c   2005/02/07 16:13:07     1.72
@@ -99,8 +99,8 @@
        kmap_prot = PAGE_KERNEL;
 }
 
-#ifdef CONFIG_MIPS64
-static void __init fixrange_init(unsigned long start, unsigned long end,
+#ifdef CONFIG_MIPS32
+void __init fixrange_init(unsigned long start, unsigned long end,
        pgd_t *pgd_base)
 {
        pgd_t *pgd;
@@ -128,7 +128,7 @@
                j = 0;
        }
 }
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_MIPS32 */
 #endif /* CONFIG_HIGHMEM */
 
 #ifndef CONFIG_DISCONTIGMEM
diff -urN linux/arch/mips/mm/pgtable-32.c linux/arch/mips/mm/pgtable-32.c
--- linux/arch/mips/mm/pgtable-32.c     2004/12/09 06:56:32     1.6
+++ linux/arch/mips/mm/pgtable-32.c     2005/02/07 16:13:07     1.7
@@ -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,37 +30,6 @@
        }
 }
 
-#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
diff -urN linux/include/asm-mips/fixmap.h linux/include/asm-mips/fixmap.h
--- linux/include/asm-mips/fixmap.h     2004/11/24 11:56:33     1.4
+++ linux/include/asm-mips/fixmap.h     2005/02/07 16:13:08     1.5
@@ -107,4 +107,11 @@
        return __virt_to_fix(vaddr);
 }
 
+/*
+ * Called from pgtable_init()
+ */
+extern void fixrange_init(unsigned long start, unsigned long end,
+        pgd_t *pgd_base);
+
+
 #endif