Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---

 memhotplug-dave/mm/page_alloc.c |    5 +++++
 1 files changed, 5 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	2004-11-12 16:51:44.000000000 -0800
+++ memhotplug-dave/mm/page_alloc.c	2004-11-12 16:51:44.000000000 -0800
@@ -1787,6 +1787,8 @@ static void __init free_area_init_core(s
 }
 
 
+/* these ifdefs should be done in a header instead */
+#ifndef CONFIG_NONLINEAR
 static void __init alloc_node_mem_map(struct pglist_data *pgdat)
 {
 	unsigned long size;
@@ -1808,6 +1810,9 @@ static void __init alloc_node_mem_map(st
 		mem_map = NODE_DATA(0)->node_mem_map;
 #endif
 }
+#else
+static void __init alloc_node_mem_map(struct pglist_data *pgdat) {}
+#endif
 
 void __init free_area_init_node(int nid, struct pglist_data *pgdat,
 		unsigned long *zones_size, unsigned long node_start_pfn,
_