---

 memhotplug-dave/mm/page_alloc.c |    3 +++
 1 files changed, 3 insertions(+)

diff -puN mm/page_alloc.c~C3-nonlinear-no_mem_map mm/page_alloc.c
--- memhotplug/mm/page_alloc.c~C3-nonlinear-no_mem_map	Thu Aug  5 09:41:08 2004
+++ memhotplug-dave/mm/page_alloc.c	Thu Aug  5 09:41:08 2004
@@ -59,6 +59,7 @@ int min_free_kbytes = 1024;
 
 static unsigned long __initdata nr_kernel_pages;
 static unsigned long __initdata nr_all_pages;
+extern void xmon_printf(const char *, ...);
 
 /*
  * Temporary debugging check for pages not lying within a given zone.
@@ -1606,7 +1607,9 @@ void __init free_area_init(unsigned long
 {
 	free_area_init_node(0, &contig_page_data, zones_size,
 			__pa(PAGE_OFFSET) >> PAGE_SHIFT, NULL);
+#ifndef CONFIG_NONLINEAR
 	mem_map = contig_page_data.node_mem_map;
+#endif
 }
 #endif
 

_