debug lk

hc

2024-02-20 e636c8d336489bf3eed5878299e6cc045bbad077

 kernel/arch/sparc/mm/init_32.c
..
..
@@ -22,7 +22,6 @@
22
22
 #include <linux/initrd.h>
23
23
 #include <linux/init.h>
24
24
 #include <linux/highmem.h>
25
-#include <linux/bootmem.h>
26
25
 #include <linux/memblock.h>
27
26
 #include <linux/pagemap.h>
28
27
 #include <linux/poison.h>
..
..
@@ -30,9 +29,7 @@
30
29
 
31
30
 #include <asm/sections.h>
32
31
 #include <asm/page.h>
33
-#include <asm/pgtable.h>
34
32
 #include <asm/vaddrs.h>
35
-#include <asm/pgalloc.h>	/* bug in asm-generic/tlb.h: check_pgt_cache */
36
33
 #include <asm/setup.h>
37
34
 #include <asm/tlb.h>
38
35
 #include <asm/prom.h>
..
..
@@ -195,6 +192,7 @@
195
192
 	/* Reserve the kernel text/data/bss. */
196
193
 	size = (start_pfn << PAGE_SHIFT) - phys_base;
197
194
 	memblock_reserve(phys_base, size);
195
+	memblock_add(phys_base, size);
198
196
 
199
197
 	size = memblock_phys_mem_size() - memblock_reserved_size();
200
198
 	*pages_avail = (size >> PAGE_SHIFT) - high_pages;
..
..
@@ -268,7 +266,7 @@
268
266
 	i = last_valid_pfn >> ((20 - PAGE_SHIFT) + 5);
269
267
 	i += 1;
270
268
 	sparc_valid_addr_bitmap = (unsigned long *)
271
-		__alloc_bootmem(i << 2, SMP_CACHE_BYTES, 0UL);
269
+		memblock_alloc(i << 2, SMP_CACHE_BYTES);
272
270
 
273
271
 	if (sparc_valid_addr_bitmap == NULL) {
274
272
 		prom_printf("mem_init: Cannot alloc valid_addr_bitmap.\n");
..
..
@@ -280,7 +278,7 @@
280
278
 
281
279
 	max_mapnr = last_valid_pfn - pfn_base;
282
280
 	high_memory = __va(max_low_pfn << PAGE_SHIFT);
283
-	free_all_bootmem();
281
+	memblock_free_all();
284
282
 
285
283
 	for (i = 0; sp_banks[i].num_bytes != 0; i++) {
286
284
 		unsigned long start_pfn = sp_banks[i].base_addr >> PAGE_SHIFT;
..
..
@@ -297,19 +295,6 @@
297
295
 
298
296
 	mem_init_print_info(NULL);
299
297
 }
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
313
298
 
314
299
 void sparc_flush_page_to_ram(struct page *page)
315
300
 {