Skip to content

Commit

Permalink
x86, mm: Move zone init from paging_init() on 64-bit
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pekka Enberg authored and Ingo Molnar committed Nov 11, 2011
1 parent ff14c1d commit 4c0b2e5
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions arch/x86/mm/init_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];

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

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

/*
Expand Down

0 comments on commit 4c0b2e5

Please sign in to comment.