From: Jeff Dike <jdike@addtoit.com>

References to ZONE_HIGHMEM need to depend on CONFIG_HIGHMEM.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Christoph Lameter <clameter@engr.sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/um/kernel/mem.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN arch/um/kernel/mem.c~reduce-max_nr_zones-make-zone_highmem-optional-fix-fix-fix arch/um/kernel/mem.c
--- a/arch/um/kernel/mem.c~reduce-max_nr_zones-make-zone_highmem-optional-fix-fix-fix
+++ a/arch/um/kernel/mem.c
@@ -226,7 +226,9 @@ void paging_init(void)
 	for(i=0;i<sizeof(zones_size)/sizeof(zones_size[0]);i++) 
 		zones_size[i] = 0;
 	zones_size[ZONE_DMA] = (end_iomem >> PAGE_SHIFT) - (uml_physmem >> PAGE_SHIFT);
+#ifdef CONFIG_HIGHMEM
 	zones_size[ZONE_HIGHMEM] = highmem >> PAGE_SHIFT;
+#endif
 	free_area_init(zones_size);
 
 	/*
_