hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/arch/m68k/mm/init.c
....@@ -17,7 +17,7 @@
1717 #include <linux/string.h>
1818 #include <linux/types.h>
1919 #include <linux/init.h>
20
-#include <linux/bootmem.h>
20
+#include <linux/memblock.h>
2121 #include <linux/gfp.h>
2222
2323 #include <asm/setup.h>
....@@ -39,11 +39,6 @@
3939 */
4040 void *empty_zero_page;
4141 EXPORT_SYMBOL(empty_zero_page);
42
-
43
-#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
44
-extern void init_pointer_table(unsigned long ptable);
45
-extern pmd_t *zero_pgtable;
46
-#endif
4742
4843 #ifdef CONFIG_MMU
4944
....@@ -89,19 +84,22 @@
8984 * page_alloc get different views of the world.
9085 */
9186 unsigned long end_mem = memory_end & PAGE_MASK;
92
- unsigned long zones_size[MAX_NR_ZONES] = { 0, };
87
+ unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0, };
9388
9489 high_memory = (void *) end_mem;
9590
96
- empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
91
+ empty_zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
92
+ if (!empty_zero_page)
93
+ panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
94
+ __func__, PAGE_SIZE, PAGE_SIZE);
9795
9896 /*
9997 * Set up SFC/DFC registers (user data space).
10098 */
10199 set_fs (USER_DS);
102100
103
- zones_size[ZONE_DMA] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
104
- free_area_init(zones_size);
101
+ max_zone_pfn[ZONE_DMA] = end_mem >> PAGE_SHIFT;
102
+ free_area_init(max_zone_pfn);
105103 }
106104
107105 #endif /* CONFIG_MMU */
....@@ -122,32 +120,38 @@
122120 static inline void init_pointer_tables(void)
123121 {
124122 #if defined(CONFIG_MMU) && !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
125
- int i;
123
+ int i, j;
126124
127125 /* insert pointer tables allocated so far into the tablelist */
128
- init_pointer_table((unsigned long)kernel_pg_dir);
126
+ init_pointer_table(kernel_pg_dir, TABLE_PGD);
129127 for (i = 0; i < PTRS_PER_PGD; i++) {
130
- if (pgd_present(kernel_pg_dir[i]))
131
- init_pointer_table(__pgd_page(kernel_pg_dir[i]));
132
- }
128
+ pud_t *pud = (pud_t *)&kernel_pg_dir[i];
129
+ pmd_t *pmd_dir;
133130
134
- /* insert also pointer table that we used to unmap the zero page */
135
- if (zero_pgtable)
136
- init_pointer_table((unsigned long)zero_pgtable);
131
+ if (!pud_present(*pud))
132
+ continue;
133
+
134
+ pmd_dir = (pmd_t *)pgd_page_vaddr(kernel_pg_dir[i]);
135
+ init_pointer_table(pmd_dir, TABLE_PMD);
136
+
137
+ for (j = 0; j < PTRS_PER_PMD; j++) {
138
+ pmd_t *pmd = &pmd_dir[j];
139
+ pte_t *pte_dir;
140
+
141
+ if (!pmd_present(*pmd))
142
+ continue;
143
+
144
+ pte_dir = (pte_t *)pmd_page_vaddr(*pmd);
145
+ init_pointer_table(pte_dir, TABLE_PTE);
146
+ }
147
+ }
137148 #endif
138149 }
139150
140151 void __init mem_init(void)
141152 {
142153 /* this will put all memory onto the freelists */
143
- free_all_bootmem();
154
+ memblock_free_all();
144155 init_pointer_tables();
145156 mem_init_print_info(NULL);
146157 }
147
-
148
-#ifdef CONFIG_BLK_DEV_INITRD
149
-void free_initrd_mem(unsigned long start, unsigned long end)
150
-{
151
- free_reserved_area((void *)start, (void *)end, -1, "initrd");
152
-}
153
-#endif