lkl: remove calls to set_max_mapnr and memblock_free_all

tavip · tavip · commit e09a62dfd58a · 2026-05-05T19:08:02.000Z
Upstream has moved these into generic code in 6.15.

Signed-off-by: Octavian Purdila &lt;tavip@google.com&gt;
diff --git a/arch/lkl/mm/bootmem.c b/arch/lkl/mm/bootmem.c
@@ -50,7 +50,6 @@ void __init bootmem_init(unsigned long mem_sz)
 
 	max_pfn = max_low_pfn = virt_to_pfn((void *)memory_end);
 	min_low_pfn = virt_to_pfn((void *)memory_start);
-	set_max_mapnr(max_pfn - ARCH_PFN_OFFSET);
 
 	empty_zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
 	memset(empty_zero_page, 0, PAGE_SIZE);
@@ -61,7 +60,6 @@ void __init bootmem_init(unsigned long mem_sz)
 
 void __init mem_init(void)
 {
-	memblock_free_all();
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ void __init bootmem_init(unsigned long mem_sz)`
`50`	`50`
`51`	`51`	`max_pfn = max_low_pfn = virt_to_pfn((void *)memory_end);`
`52`	`52`	`min_low_pfn = virt_to_pfn((void *)memory_start);`
`53`		`- set_max_mapnr(max_pfn - ARCH_PFN_OFFSET);`
`54`	`53`
`55`	`54`	`empty_zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE);`
`56`	`55`	`memset(empty_zero_page, 0, PAGE_SIZE);`
`@@ -61,7 +60,6 @@ void __init bootmem_init(unsigned long mem_sz)`
`61`	`60`
`62`	`61`	`void __init mem_init(void)`
`63`	`62`	`{`
`64`		`- memblock_free_all();`
`65`	`63`	`}`
`66`	`64`
`67`	`65`	`/*`