summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2011-11-01 15:58:17 +0200
committerIngo Molnar <mingo@elte.hu>2011-11-11 10:22:43 +0100
commit4c0b2e5f8940fec7cbeafcf641fecd5e746329c5 (patch)
treea4e4e8e9e3f59500a142e51a157530891d4479b0 /arch
parentff14c1d01576fb839a925a42596582f6c68a1a1a (diff)
downloadop-kernel-dev-4c0b2e5f8940fec7cbeafcf641fecd5e746329c5.zip
op-kernel-dev-4c0b2e5f8940fec7cbeafcf641fecd5e746329c5.tar.gz
x86, mm: Move zone init from paging_init() on 64-bit
This patch introduces a zone_sizes_init() helper function on 64-bit to make it more similar to 32-bit init. Acked-by: Tejun Heo <tj@kernel.org> Acked-by: Yinghai Lu <yinghai@kernel.org> Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Pekka Enberg <penberg@kernel.org> Link: http://lkml.kernel.org/r/1320155902-10424-2-git-send-email-penberg@kernel.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/init_64.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index bbaaa00..3ddda59 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -612,7 +612,7 @@ void __init initmem_init(void)
}
#endif
-void __init paging_init(void)
+static void __init zone_sizes_init(void)
{
unsigned long max_zone_pfns[MAX_NR_ZONES];
@@ -623,6 +623,11 @@ void __init paging_init(void)
max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
max_zone_pfns[ZONE_NORMAL] = max_pfn;
+ free_area_init_nodes(max_zone_pfns);
+}
+
+void __init paging_init(void)
+{
sparse_memory_present_with_active_regions(MAX_NUMNODES);
sparse_init();
@@ -634,7 +639,7 @@ void __init paging_init(void)
*/
node_clear_state(0, N_NORMAL_MEMORY);
- free_area_init_nodes(max_zone_pfns);
+ zone_sizes_init();
}
/*
OpenPOWER on IntegriCloud