[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1320155902-10424-4-git-send-email-penberg@kernel.org>
Date: Tue, 1 Nov 2011 15:58:19 +0200
From: Pekka Enberg <penberg@...nel.org>
To: x86@...nel.org
Cc: linux-kernel@...r.kernel.org, Tejun Heo <tj@...nel.org>,
Yinghai Lu <yinghai@...nel.org>,
David Rientjes <rientjes@...gle.com>,
Arun Sharma <asharma@...com>,
Pekka Enberg <penberg@...nel.org>,
"H. Peter Anvin" <hpa@...ux.intel.com>
Subject: [PATCH v2 4/7] 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@...nel.org>
Acked-by: Yinghai Lu <yinghai@...nel.org>
Cc: H. Peter Anvin <hpa@...ux.intel.com>
Acked-by: David Rientjes <rientjes@...gle.com>
Acked-by: Arun Sharma <asharma@...com>
Signed-off-by: Pekka Enberg <penberg@...nel.org>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists