From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755210Ab1KAN76 (ORCPT ); Tue, 1 Nov 2011 09:59:58 -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 S1754847Ab1KAN6x (ORCPT ); Tue, 1 Nov 2011 09:58:53 -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 4/7] x86, mm: Wrap ZONE_DMA32 with CONFIG_ZONE_DMA32 Date: Tue, 1 Nov 2011 15:58:19 +0200 Message-Id: <1320155902-10424-4-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 In preparation for unifying 32-bit and 64-bit zone_sizes_init() make sure ZONE_DMA32 is wrapped in CONFIG_ZONE_DMA32. Acked-by: Tejun Heo Acked-by: Yinghai Lu Cc: H. Peter Anvin Acked-by: David Rientjes Acked-by: Arun Sharma Signed-off-by: Pekka Enberg --- arch/x86/mm/init_64.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 3ddda59..a9214e6 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -620,7 +620,9 @@ static void __init zone_sizes_init(void) #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_pfn; free_area_init_nodes(max_zone_pfns); -- 1.7.6.4