diff options
author | Pekka Enberg <penberg@kernel.org> | 2011-11-01 09:58:16 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-11-11 04:22:41 -0500 |
commit | ff14c1d01576fb839a925a42596582f6c68a1a1a (patch) | |
tree | aaeb66880b5da8a7bb358f8d7b419ba284fe6317 | |
parent | 5e442a493fc59fa536c76db1fff5b49ca36a88c5 (diff) |
x86, mm: Use MAX_DMA_PFN for ZONE_DMA on 32-bit
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>
-rw-r--r-- | 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 29f7c6d98179..434c97d620c2 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) | |||
679 | unsigned long max_zone_pfns[MAX_NR_ZONES]; | 679 | unsigned long max_zone_pfns[MAX_NR_ZONES]; |
680 | memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); | 680 | memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); |
681 | #ifdef CONFIG_ZONE_DMA | 681 | #ifdef CONFIG_ZONE_DMA |
682 | max_zone_pfns[ZONE_DMA] = | 682 | max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN; |
683 | virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; | ||
684 | #endif | 683 | #endif |
685 | max_zone_pfns[ZONE_NORMAL] = max_low_pfn; | 684 | max_zone_pfns[ZONE_NORMAL] = max_low_pfn; |
686 | #ifdef CONFIG_HIGHMEM | 685 | #ifdef CONFIG_HIGHMEM |