From 4a3de9dc3dff853a61c196670c640ec08fec2295 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Tue, 1 Nov 2011 15:58:17 +0200 Subject: [PATCH] --- yaml --- r: 283515 b: refs/heads/master c: 4c0b2e5f8940fec7cbeafcf641fecd5e746329c5 h: refs/heads/master i: 283513: fe05707e9453ac48ae7a13095e70a9063a3c2d7a 283511: 569bb6d676340cb99125c38b3b7eae288ca259ab v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/init_64.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1b797171d277..b0dd919c5079 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff14c1d01576fb839a925a42596582f6c68a1a1a +refs/heads/master: 4c0b2e5f8940fec7cbeafcf641fecd5e746329c5 diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c index bbaaa005bf0e..3ddda59f7087 100644 --- a/trunk/arch/x86/mm/init_64.c +++ b/trunk/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(); } /*