2 files changed, 12 insertions, 12 deletions

diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 000cf03751fe..519e63c3c130 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -1083,16 +1083,15 @@ static unsigned long __init setup_memory(void)
 
 void __init zone_sizes_init(void)
 {
+        unsigned long max_zone_pfns[MAX_NR_ZONES];
+        memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
+        max_zone_pfns[ZONE_DMA] =
+                virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
+        max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
 #ifdef CONFIG_HIGHMEM
-        unsigned long max_zone_pfns[MAX_NR_ZONES] = {
-                        virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT,
-                        max_low_pfn,
-                        highend_pfn};
+        max_zone_pfns[ZONE_HIGHMEM] = highend_pfn;
         add_active_range(0, 0, highend_pfn);
 #else
-        unsigned long max_zone_pfns[MAX_NR_ZONES] = {
-                        virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT,
-                        max_low_pfn};
         add_active_range(0, 0, max_low_pfn);
 #endif
 
diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c
index 455597db84df..ddbdb0336f28 100644
--- a/arch/i386/mm/discontig.c
+++ b/arch/i386/mm/discontig.c
@@ -356,11 +356,12 @@ void __init numa_kva_reserve(void)
 void __init zone_sizes_init(void)
 {
         int nid;
-        unsigned long max_zone_pfns[MAX_NR_ZONES] = {
-                virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT,
-                max_low_pfn,
-                highend_pfn
-        };
+        unsigned long max_zone_pfns[MAX_NR_ZONES];
+        memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
+        max_zone_pfns[ZONE_DMA] =
+                virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
+        max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
+        max_zone_pfns[ZONE_HIGHMEM] = highend_pfn;
 
         /* If SRAT has not registered memory, register it now */
         if (find_max_pfn_with_active_regions() == 0) {