Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/page_types.h
View File

@ -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__ */

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

2
arch/x86/mm/init_32.c
View File

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

2
arch/x86/mm/init_64.c
View File

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

2
arch/x86/mm/numa_32.c
View File

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

16
arch/x86/mm/numa_64.c
View File

@ -13,6 +13,7 @@
#include <linux/module.h>
#include <linux/nodemask.h>
#include <linux/sched.h>
#include <linux/acpi.h>
#include <asm/e820.h>
#include <asm/proto.h>
@ -579,10 +580,23 @@ static int __init numa_emulation(unsigned long start_pfn,
}
#endif /* CONFIG_NUMA_EMU */
void __init initmem_init(int acpi, int amd)
void __init initmem_init(void)
{
int acpi = 0, amd = 0;
int i;
#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
nodes_clear(node_possible_map);
nodes_clear(node_online_map);