]> Pileus Git - ~andy/linux/commitdiff
x86, mm: Use MAX_DMA_PFN for ZONE_DMA on 32-bit
authorPekka Enberg <penberg@kernel.org>
Tue, 1 Nov 2011 13:58:16 +0000 (15:58 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 11 Nov 2011 09:22:41 +0000 (10:22 +0100)
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 <tj@kernel.org>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Link: http://lkml.kernel.org/r/1320155902-10424-1-git-send-email-penberg@kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/mm/init_32.c

index 29f7c6d981790cea29114c1b20d7cb54904a702e..434c97d620c2cc511096b798a7265e7bdc45089c 100644 (file)
@@ -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