From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754901Ab1KAN6r (ORCPT ); Tue, 1 Nov 2011 09:58:47 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:44940 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753582Ab1KAN6o (ORCPT ); Tue, 1 Nov 2011 09:58:44 -0400 From: Pekka Enberg To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Tejun Heo , Yinghai Lu , David Rientjes , Arun Sharma , Pekka Enberg , "H. Peter Anvin" Subject: [PATCH v2 2/7] x86, mm: Move zone init from paging_init() on 64-bit Date: Tue, 1 Nov 2011 15:58:17 +0200 Message-Id: <1320155902-10424-2-git-send-email-penberg@kernel.org> X-Mailer: git-send-email 1.7.6.4 In-Reply-To: <1320155902-10424-1-git-send-email-penberg@kernel.org> References: <1320155902-10424-1-git-send-email-penberg@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Yinghai Lu Cc: H. Peter Anvin Acked-by: David Rientjes Signed-off-by: Pekka Enberg --- arch/x86/mm/init_64.c | 9 +++++++-- 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(); } /* -- 1.7.6.4