Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc5efe39 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: fix bootmem cross node for 32bit numa, cleanup 



Impact: clean up

Simplify the code, reuse some lines.
Remove min_low_pfn reference, it is always 0

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <49AEE2C4.2030602@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 731ddea6

arch/x86/mm/init_32.c

+3 −13
Original line number Diff line number Diff line
@@ -776,7 +776,6 @@ static void __init zone_sizes_init(void) 
	free_area_init_nodes(max_zone_pfns);

}



#ifdef CONFIG_NEED_MULTIPLE_NODES

static unsigned long __init setup_node_bootmem(int nodeid,

				 unsigned long start_pfn,

				 unsigned long end_pfn,
@@ -802,7 +801,6 @@ static unsigned long __init setup_node_bootmem(int nodeid, 


	return bootmap + bootmap_size;

}

#endif



void __init setup_bootmem_allocator(void)

{
@@ -812,8 +810,7 @@ void __init setup_bootmem_allocator(void) 
	 * Initialize the boot-time allocator (with low memory only):

	 */

	bootmap_size = bootmem_bootmap_pages(max_low_pfn)<<PAGE_SHIFT;

	bootmap = find_e820_area(min_low_pfn<<PAGE_SHIFT,

				 max_pfn_mapped<<PAGE_SHIFT, bootmap_size,

	bootmap = find_e820_area(0, max_pfn_mapped<<PAGE_SHIFT, bootmap_size,

				 PAGE_SIZE);

	if (bootmap == -1L)

		panic("Cannot find bootmem map of size %ld\n", bootmap_size);
@@ -821,21 +818,14 @@ void __init setup_bootmem_allocator(void) 


	printk(KERN_INFO "  mapped low ram: 0 - %08lx\n",

		 max_pfn_mapped<<PAGE_SHIFT);

	printk(KERN_INFO "  low ram: %08lx - %08lx\n",

		 min_low_pfn<<PAGE_SHIFT, max_low_pfn<<PAGE_SHIFT);

	printk(KERN_INFO "  low ram: 0 - %08lx\n", max_low_pfn<<PAGE_SHIFT);



#ifdef CONFIG_NEED_MULTIPLE_NODES

	for_each_online_node(nodeid)

		bootmap = setup_node_bootmem(nodeid, node_start_pfn[nodeid],

					node_end_pfn[nodeid], bootmap);

#else

	/* don't touch min_low_pfn */

	bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap >> PAGE_SHIFT,

					 min_low_pfn, max_low_pfn);

	printk(KERN_INFO "  bootmap %08lx - %08lx\n",

		 bootmap, bootmap + bootmap_size);

	free_bootmem_with_active_regions(0, max_low_pfn);

	early_res_to_bootmem(0, max_low_pfn<<PAGE_SHIFT);

	bootmap = setup_node_bootmem(0, 0, max_low_pfn, bootmap);

#endif



	after_init_bootmem = 1;