From f303c8b3a980d884776f688ac7ce7a5d2bef6fed Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@kernel.org>
Date: Tue, 1 Nov 2011 15:58:21 +0200
Subject: [PATCH] --- yaml --- r: 283519 b: refs/heads/master c:
 248b52b97da7a712d2263a51d8d84c959f38ef75 h: refs/heads/master i:   283517:
 193664fbd0f9fa981d90f1af61608ad3489a02aa   283515:
 4a3de9dc3dff853a61c196670c640ec08fec2295   283511:
 569bb6d676340cb99125c38b3b7eae288ca259ab   283503:
 063d1e0a6e11821ed119ffd9297ef7fc92fce829   283487:
 e282bcbafe63b7d7fc90f65fe3b1d5ba86bbd597   283455:
 7825c094532fe425e8bc01e436aa0f931db2356b   283391:
 c0cafdedf4c03c8b23a8a76ce750d9b0ca2b7f27 v: v3

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

diff --git a/[refs] b/[refs]
index c39e04e78dcc..87e0e74aee19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ece838b6257412647197c072fe59dfc6615df144
+refs/heads/master: 248b52b97da7a712d2263a51d8d84c959f38ef75
diff --git a/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c
index 5ac0118b7610..27455b958b8d 100644
--- a/trunk/arch/x86/mm/init_32.c
+++ b/trunk/arch/x86/mm/init_32.c
@@ -677,9 +677,13 @@ void __init initmem_init(void)
 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] = MAX_DMA_PFN;
+#endif
+#ifdef CONFIG_ZONE_DMA32
+        max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
 #endif
 	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
 #ifdef CONFIG_HIGHMEM
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index f6b1f087cced..06c4360cf796 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/arch/x86/mm/init_64.c
@@ -624,6 +624,9 @@ static void __init zone_sizes_init(void)
 	max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
 #endif
 	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
+#ifdef CONFIG_HIGHMEM
+	max_zone_pfns[ZONE_HIGHMEM] = max_pfn;
+#endif
 
 	free_area_init_nodes(max_zone_pfns);
 }