Commit d8fc3afc authored by Tejun Heo's avatar Tejun Heo
Browse files

x86, NUMA: Move *_numa_init() invocations into initmem_init() 



There's no reason for these to live in setup_arch().  Move them inside
initmem_init().

- v2: x86-32 initmem_init() weren't updated breaking 32bit builds.
  Fixed.  Found by Ankita.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Ankita Garg <ankita@in.ibm.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Shaohui Zheng <shaohui.zheng@intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: H. Peter Anvin <hpa@linux.intel.com>
parent a9aec56a

arch/x86/include/asm/page_types.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ extern unsigned long init_memory_mapping(unsigned long start, 


void init_memory_mapping_high(void);



extern void initmem_init(int acpi, int k8);

extern void initmem_init(void);

extern void free_initmem(void);



#endif	/* !__ASSEMBLY__ */

arch/x86/kernel/setup.c

+1 −15
Original line number Diff line number Diff line
@@ -719,8 +719,6 @@ early_param("reservelow", parse_reservelow); 


void __init setup_arch(char **cmdline_p)

{

	int acpi = 0;

	int amd = 0;

	unsigned long flags;



#ifdef CONFIG_X86_32
@@ -991,19 +989,7 @@ void __init setup_arch(char **cmdline_p) 


	early_acpi_boot_init();



#ifdef CONFIG_ACPI_NUMA

	/*

	 * Parse SRAT to discover nodes.

	 */

	acpi = !x86_acpi_numa_init();

#endif



#ifdef CONFIG_AMD_NUMA

	if (!acpi)

		amd = !amd_numa_init();

#endif



	initmem_init(acpi, amd);

	initmem_init();

	memblock_find_dma_reserve();

	dma32_reserve_bootmem();

arch/x86/mm/init_32.c

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ void __init find_low_pfn_range(void) 
}



#ifndef CONFIG_NEED_MULTIPLE_NODES

void __init initmem_init(int acpi, int k8)

void __init initmem_init(void)

{

#ifdef CONFIG_HIGHMEM

	highstart_pfn = highend_pfn = max_pfn;

arch/x86/mm/init_64.c

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ kernel_physical_mapping_init(unsigned long start, 
}



#ifndef CONFIG_NUMA

void __init initmem_init(int acpi, int k8)

void __init initmem_init(void)

{

	memblock_x86_register_active_regions(0, 0, max_pfn);

	init_memory_mapping_high();

arch/x86/mm/numa_32.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static void init_remap_allocator(int nid) 
		(ulong) node_remap_end_vaddr[nid]);

}



void __init initmem_init(int acpi, int k8)

void __init initmem_init(void)

{

	int nid;

	long kva_target_pfn;

CRA Git | Maintained and supported by SUSTech CRA and CCSE