From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754825Ab1KAN6l (ORCPT ); Tue, 1 Nov 2011 09:58:41 -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 S1753582Ab1KAN6k (ORCPT ); Tue, 1 Nov 2011 09:58:40 -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 1/7] x86, mm: Use MAX_DMA_PFN for ZONE_DMA on 32-bit Date: Tue, 1 Nov 2011 15:58:16 +0200 Message-Id: <1320155902-10424-1-git-send-email-penberg@kernel.org> X-Mailer: git-send-email 1.7.6.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use MAX_DMA_PFN which represents the 16 MB ISA DMA limit on 32-bit x86 just like we do on 64-bit. 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_32.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 29f7c6d..434c97d 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -679,8 +679,7 @@ 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] = - virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; + max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN; #endif max_zone_pfns[ZONE_NORMAL] = max_low_pfn; #ifdef CONFIG_HIGHMEM -- 1.7.6.4