diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-02-07 11:13:07 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:30:28 -0400 |
commit | 84fd089a425f055ecf4a6a72f2509ccb98314b8f (patch) | |
tree | 36f2f224adac024bfa2569911da9d9200b3f5ad8 /arch/mips | |
parent | cc26b815ddde4168cd853be9e62ecacd392e3f64 (diff) |
Delete duplicate copy of fixrange_init.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/mm/init.c | 4 | ||||
-rw-r--r-- | arch/mips/mm/pgtable-32.c | 32 |
2 files changed, 3 insertions, 33 deletions
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index dc6830b10fab..77cbccaff955 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
@@ -96,8 +96,8 @@ static void __init kmap_init(void) | |||
96 | kmap_prot = PAGE_KERNEL; | 96 | kmap_prot = PAGE_KERNEL; |
97 | } | 97 | } |
98 | 98 | ||
99 | #ifdef CONFIG_64BIT | 99 | #ifdef CONFIG_32BIT |
100 | static void __init fixrange_init(unsigned long start, unsigned long end, | 100 | void __init fixrange_init(unsigned long start, unsigned long end, |
101 | pgd_t *pgd_base) | 101 | pgd_t *pgd_base) |
102 | { | 102 | { |
103 | pgd_t *pgd; | 103 | pgd_t *pgd; |
diff --git a/arch/mips/mm/pgtable-32.c b/arch/mips/mm/pgtable-32.c index 4f07f81e8500..74492618f2ae 100644 --- a/arch/mips/mm/pgtable-32.c +++ b/arch/mips/mm/pgtable-32.c | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
11 | #include <linux/bootmem.h> | 11 | #include <linux/bootmem.h> |
12 | #include <linux/highmem.h> | 12 | #include <linux/highmem.h> |
13 | #include <asm/fixmap.h> | ||
13 | #include <asm/pgtable.h> | 14 | #include <asm/pgtable.h> |
14 | 15 | ||
15 | void pgd_init(unsigned long page) | 16 | void pgd_init(unsigned long page) |
@@ -29,37 +30,6 @@ void pgd_init(unsigned long page) | |||
29 | } | 30 | } |
30 | } | 31 | } |
31 | 32 | ||
32 | #ifdef CONFIG_HIGHMEM | ||
33 | static void __init fixrange_init (unsigned long start, unsigned long end, | ||
34 | pgd_t *pgd_base) | ||
35 | { | ||
36 | pgd_t *pgd; | ||
37 | pmd_t *pmd; | ||
38 | pte_t *pte; | ||
39 | int i, j; | ||
40 | unsigned long vaddr; | ||
41 | |||
42 | vaddr = start; | ||
43 | i = __pgd_offset(vaddr); | ||
44 | j = __pmd_offset(vaddr); | ||
45 | pgd = pgd_base + i; | ||
46 | |||
47 | for ( ; (i < PTRS_PER_PGD) && (vaddr != end); pgd++, i++) { | ||
48 | pmd = (pmd_t *)pgd; | ||
49 | for (; (j < PTRS_PER_PMD) && (vaddr != end); pmd++, j++) { | ||
50 | if (pmd_none(*pmd)) { | ||
51 | pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE); | ||
52 | set_pmd(pmd, __pmd((unsigned long)pte)); | ||
53 | if (pte != pte_offset_kernel(pmd, 0)) | ||
54 | BUG(); | ||
55 | } | ||
56 | vaddr += PMD_SIZE; | ||
57 | } | ||
58 | j = 0; | ||
59 | } | ||
60 | } | ||
61 | #endif | ||
62 | |||
63 | void __init pagetable_init(void) | 33 | void __init pagetable_init(void) |
64 | { | 34 | { |
65 | #ifdef CONFIG_HIGHMEM | 35 | #ifdef CONFIG_HIGHMEM |