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

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

x86: merge zones_sizes_init for numa and non numa on 32-bit 



move out e820_register_active_regions from non numa zones_sizes_init()
and remove numa version zones_sizes_init().

and let 32 bit call remove_all_active_ranges() in setup_arch() directly
like 64-bit

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d9a81b44

arch/x86/kernel/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -749,10 +749,8 @@ void __init setup_arch(char **cmdline_p) 
	 */

	acpi_boot_table_init();



#ifdef CONFIG_X86_64

	/* Remove active ranges so rediscovery with NUMA-awareness happens */

	remove_all_active_ranges();

#endif



#ifdef CONFIG_ACPI_NUMA

	/*

arch/x86/mm/discontig_32.c

+0 −16
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ void __init initmem_init(unsigned long start_pfn, 
	 * and ZONE_HIGHMEM.

	 */



	remove_all_active_ranges();

	get_memcfg_numa();



	kva_pages = round_up(calculate_numa_remap_pages(), PTRS_PER_PTE);
@@ -390,21 +389,6 @@ void __init initmem_init(unsigned long start_pfn, 
	setup_bootmem_allocator();

}



void __init zone_sizes_init(void)

{

	unsigned long max_zone_pfns[MAX_NR_ZONES];

	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));

	max_zone_pfns[ZONE_DMA] =

		virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

#ifdef CONFIG_HIGHMEM

	max_zone_pfns[ZONE_HIGHMEM] = highend_pfn;

#endif



	free_area_init_nodes(max_zone_pfns);

	return;

}



void __init set_highmem_pages_init(void)

{

#ifdef CONFIG_HIGHMEM

arch/x86/mm/init_32.c

+4 −6
Original line number Diff line number Diff line
@@ -660,12 +660,14 @@ void __init initmem_init(unsigned long start_pfn, 
	if (max_pfn > max_low_pfn)

		highstart_pfn = max_low_pfn;

	memory_present(0, 0, highend_pfn);

	e820_register_active_regions(0, 0, highend_pfn);

	printk(KERN_NOTICE "%ldMB HIGHMEM available.\n",

		pages_to_mb(highend_pfn - highstart_pfn));

	num_physpages = highend_pfn;

	high_memory = (void *) __va(highstart_pfn * PAGE_SIZE - 1) + 1;

#else

	memory_present(0, 0, max_low_pfn);

	e820_register_active_regions(0, 0, max_low_pfn);

	num_physpages = max_low_pfn;

	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE - 1) + 1;

#endif
@@ -677,25 +679,21 @@ void __init initmem_init(unsigned long start_pfn, 


	setup_bootmem_allocator();

}

#endif /* !CONFIG_NEED_MULTIPLE_NODES */



void __init zone_sizes_init(void)

static void __init zone_sizes_init(void)

{

	unsigned long max_zone_pfns[MAX_NR_ZONES];

	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));

	max_zone_pfns[ZONE_DMA] =

		virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

	remove_all_active_ranges();

#ifdef CONFIG_HIGHMEM

	max_zone_pfns[ZONE_HIGHMEM] = highend_pfn;

	e820_register_active_regions(0, 0, highend_pfn);

#else

	e820_register_active_regions(0, 0, max_low_pfn);

#endif



	free_area_init_nodes(max_zone_pfns);

}

#endif /* !CONFIG_NEED_MULTIPLE_NODES */



void __init setup_bootmem_allocator(void)

{

include/asm-x86/page_32.h

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ extern void find_low_pfn_range(void); 
extern unsigned long init_memory_mapping(unsigned long start,

					 unsigned long end);

extern void initmem_init(unsigned long, unsigned long);

extern void zone_sizes_init(void);

extern void setup_bootmem_allocator(void);