hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/arch/sparc/mm/init_32.c
....@@ -22,7 +22,6 @@
2222 #include <linux/initrd.h>
2323 #include <linux/init.h>
2424 #include <linux/highmem.h>
25
-#include <linux/bootmem.h>
2625 #include <linux/memblock.h>
2726 #include <linux/pagemap.h>
2827 #include <linux/poison.h>
....@@ -30,9 +29,7 @@
3029
3130 #include <asm/sections.h>
3231 #include <asm/page.h>
33
-#include <asm/pgtable.h>
3432 #include <asm/vaddrs.h>
35
-#include <asm/pgalloc.h> /* bug in asm-generic/tlb.h: check_pgt_cache */
3633 #include <asm/setup.h>
3734 #include <asm/tlb.h>
3835 #include <asm/prom.h>
....@@ -195,6 +192,7 @@
195192 /* Reserve the kernel text/data/bss. */
196193 size = (start_pfn << PAGE_SHIFT) - phys_base;
197194 memblock_reserve(phys_base, size);
195
+ memblock_add(phys_base, size);
198196
199197 size = memblock_phys_mem_size() - memblock_reserved_size();
200198 *pages_avail = (size >> PAGE_SHIFT) - high_pages;
....@@ -268,7 +266,7 @@
268266 i = last_valid_pfn >> ((20 - PAGE_SHIFT) + 5);
269267 i += 1;
270268 sparc_valid_addr_bitmap = (unsigned long *)
271
- __alloc_bootmem(i << 2, SMP_CACHE_BYTES, 0UL);
269
+ memblock_alloc(i << 2, SMP_CACHE_BYTES);
272270
273271 if (sparc_valid_addr_bitmap == NULL) {
274272 prom_printf("mem_init: Cannot alloc valid_addr_bitmap.\n");
....@@ -280,7 +278,7 @@
280278
281279 max_mapnr = last_valid_pfn - pfn_base;
282280 high_memory = __va(max_low_pfn << PAGE_SHIFT);
283
- free_all_bootmem();
281
+ memblock_free_all();
284282
285283 for (i = 0; sp_banks[i].num_bytes != 0; i++) {
286284 unsigned long start_pfn = sp_banks[i].base_addr >> PAGE_SHIFT;
....@@ -297,19 +295,6 @@
297295
298296 mem_init_print_info(NULL);
299297 }
300
-
301
-void free_initmem (void)
302
-{
303
- free_initmem_default(POISON_FREE_INITMEM);
304
-}
305
-
306
-#ifdef CONFIG_BLK_DEV_INITRD
307
-void free_initrd_mem(unsigned long start, unsigned long end)
308
-{
309
- free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
310
- "initrd");
311
-}
312
-#endif
313298
314299 void sparc_flush_page_to_ram(struct page *page)
315300 {