Merge branch 'master' into gfs2

1 files changed, 8 insertions, 2 deletions

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 61280167c560..c95855ba6ab5 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -79,8 +79,10 @@ void mem_init(void)
 
         /* this will put all low memory onto the freelists */
         totalram_pages = free_all_bootmem();
+#ifdef CONFIG_HIGHMEM
         totalhigh_pages = highmem >> PAGE_SHIFT;
         totalram_pages += totalhigh_pages;
+#endif
         num_physpages = totalram_pages;
         max_pfn = totalram_pages;
         printk(KERN_INFO "Memory: %luk available\n", 
@@ -221,10 +223,14 @@ void paging_init(void)
 
         empty_zero_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE);
         empty_bad_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE);
-        for(i=0;i<sizeof(zones_size)/sizeof(zones_size[0]);i++) 
+        for(i = 0; i < ARRAY_SIZE(zones_size); i++)
                 zones_size[i] = 0;
-        zones_size[ZONE_DMA] = (end_iomem >> PAGE_SHIFT) - (uml_physmem >> PAGE_SHIFT);
+
+        zones_size[ZONE_NORMAL] = (end_iomem >> PAGE_SHIFT) -
+                (uml_physmem >> PAGE_SHIFT);
+#ifdef CONFIG_HIGHMEM
         zones_size[ZONE_HIGHMEM] = highmem >> PAGE_SHIFT;
+#endif
         free_area_init(zones_size);
 
         /*