The patch titled
uml: fix ZONE_HIGHMEM compilation error
has been added to the -mm tree. Its filename is
reduce-max_nr_zones-make-zone_highmem-optional-fix-fix-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: uml: fix ZONE_HIGHMEM compilation error
From: Jeff Dike <jdike@xxxxxxxxxxx>
References to ZONE_HIGHMEM need to depend on CONFIG_HIGHMEM.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Christoph Lameter <clameter@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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);
/*
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
reduce-max_nr_zones-make-zone_highmem-optional-fix-fix-fix.patch
uml-tidy-longjmp-macro.patch
uml-tidy-biarch-gcc-support.patch
uml-header-formatting-cleanups.patch
uml-remove-pte_mkexec.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
