Commit-ID: 80b3cac97bc14fdf839d967602e599cbf82ea336 Gitweb: http://git.kernel.org/tip/80b3cac97bc14fdf839d967602e599cbf82ea336 Author: Pekka Enberg <penberg@xxxxxxxxxx> AuthorDate: Tue, 1 Nov 2011 15:58:19 +0200 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Fri, 11 Nov 2011 10:22:48 +0100 x86, mm: Wrap ZONE_DMA32 with CONFIG_ZONE_DMA32 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 <tj@xxxxxxxxxx> Acked-by: Yinghai Lu <yinghai@xxxxxxxxxx> Acked-by: David Rientjes <rientjes@xxxxxxxxxx> Acked-by: Arun Sharma <asharma@xxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> Link: http://lkml.kernel.org/r/1320155902-10424-4-git-send-email-penberg@xxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- 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); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|