From 193664fbd0f9fa981d90f1af61608ad3489a02aa Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@kernel.org>
Date: Tue, 1 Nov 2011 15:58:19 +0200
Subject: [PATCH] --- yaml --- r: 283517 b: refs/heads/master c:
 80b3cac97bc14fdf839d967602e599cbf82ea336 h: refs/heads/master i:   283515:
 4a3de9dc3dff853a61c196670c640ec08fec2295 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/init_64.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2134149cb5ac..7d4ac29a8c66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4794640ca408acda18eb31b126f58a58803b9c9
+refs/heads/master: 80b3cac97bc14fdf839d967602e599cbf82ea336
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index 3ddda59f7087..a9214e6e721a 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/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);