summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/init_64.c
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2011-11-01 15:58:22 +0200
committerIngo Molnar <mingo@elte.hu>2011-11-11 10:22:55 +0100
commit176239153049a023d060ce95b05f7ef31667e362 (patch)
treefce64421a695752fc9dfa9fa2331c11f95083146 /arch/x86/mm/init_64.c
parent248b52b97da7a712d2263a51d8d84c959f38ef75 (diff)
downloadop-kernel-dev-176239153049a023d060ce95b05f7ef31667e362.zip
op-kernel-dev-176239153049a023d060ce95b05f7ef31667e362.tar.gz
x86, mm: Unify zone_sizes_init()
Now that zone_sizes_init() is identical on 32-bit and 64-bit, move the code to arch/x86/mm/init.c and use it for both architectures. Acked-by: Tejun Heo <tj@kernel.org> Acked-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Pekka Enberg <penberg@kernel.org> Link: http://lkml.kernel.org/r/1320155902-10424-7-git-send-email-penberg@kernel.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/init_64.c')
-rw-r--r--arch/x86/mm/init_64.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 06c4360..6fcce7d 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -612,25 +612,6 @@ void __init initmem_init(void)
}
#endif
-static void __init zone_sizes_init(void)
-{
- unsigned long max_zone_pfns[MAX_NR_ZONES];
-
- memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
-#ifdef CONFIG_ZONE_DMA
- max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN;
-#endif
-#ifdef CONFIG_ZONE_DMA32
- max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
-#endif
- max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
-#ifdef CONFIG_HIGHMEM
- max_zone_pfns[ZONE_HIGHMEM] = max_pfn;
-#endif
-
- free_area_init_nodes(max_zone_pfns);
-}
-
void __init paging_init(void)
{
sparse_memory_present_with_active_regions(MAX_NUMNODES);
OpenPOWER on IntegriCloud