From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755967Ab1J1OXk (ORCPT ); Fri, 28 Oct 2011 10:23:40 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:65189 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755942Ab1J1OXj (ORCPT ); Fri, 28 Oct 2011 10:23:39 -0400 From: Pekka Enberg To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Pekka Enberg , Tejun Heo , Yinghai Lu , "H. Peter Anvin" , David Rientjes Subject: [RFC/PATCH 6/7] x86, mm: Prepare zone_sizes_init() for unification Date: Fri, 28 Oct 2011 17:23:20 +0300 Message-Id: <1319811801-1725-6-git-send-email-penberg@kernel.org> X-Mailer: git-send-email 1.7.6.4 In-Reply-To: <1319811801-1725-1-git-send-email-penberg@kernel.org> References: <1319811801-1725-1-git-send-email-penberg@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make 32-bit and 64-bit zone_sizes_init() identical in preparation for unification. Cc: Tejun Heo Cc: Yinghai Lu Cc: H. Peter Anvin Cc: David Rientjes Signed-off-by: Pekka Enberg --- arch/x86/mm/init_32.c | 4 ++++ arch/x86/mm/init_64.c | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 6101894..12274fb 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -677,10 +677,14 @@ void __init initmem_init(void) 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; diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index f6b1f08..06c4360 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -624,6 +624,9 @@ static void __init zone_sizes_init(void) 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); } -- 1.7.6.4