lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Tejun 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>
This commit is contained in:
Tejun Heo
2011-02-16 12:13:06 +01:00
parent a9aec56afa
commit d8fc3afc49
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/x86/kernel/setup.c
View File

@ -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();