diff options
| author | Anton Blanchard <anton@samba.org> | 2014-09-17 22:15:36 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-10 09:59:26 +1100 |
| commit | 21098b9e07476deb3f40acd7e51cffbffb4ef865 (patch) | |
| tree | a61d80fa76e978dc86448c45de74bd1a3e7b5ad1 /arch | |
| parent | 68cf0d642f62267b960f947370539ff3582c4935 (diff) | |
powerpc: Move sparse_init() into initmem_init
We did part of sparse initialisation in setup_arch and part in
initmem_init. Put them together.
Signed-off-by: Anton Blanchard <anton@samba.org>
Tested-by: Emil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/mm/mem.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/mm/numa.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 91d9cfaffe6..6e5310ddf8c 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -690,7 +690,6 @@ void __init setup_arch(char **cmdline_p) emergency_stack_init(); initmem_init(); - sparse_init(); #ifdef CONFIG_DUMMY_CONSOLE conswitchp = &dummy_con; diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index e076d19c095..b7285a5870f 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -205,6 +205,7 @@ void __init initmem_init(void) /* XXX need to clip this if using highmem? */ sparse_memory_present_with_active_regions(0); + sparse_init(); } /* mark pages that don't exist as nosave */ diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 2e9ad2d76b7..417b0a523a4 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -966,6 +966,8 @@ void __init initmem_init(void) sparse_memory_present_with_active_regions(nid); } + sparse_init(); + setup_node_to_cpumask_map(); reset_numa_cpu_lookup_table(); |