Re: [3/7] 080 alloc_remap i386

[Dave Hansen <haveblue@us.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 102 bytes --]

This should get rid of the #ifdefs surround the alloc_remap() calls. 
Compiles on non-discontig i386.

[-- Attachment #2: 3_7_080_alloc_remap_i386-removeifdefs.patch --]
[-- Type: text/plain, Size: 1252 bytes --]



---

 sparsemem-dave/include/linux/bootmem.h |    9 +++++++++
 1 files changed, 9 insertions(+)

diff -puN arch/i386/mm/discontig.c~3_7_080_alloc_remap_i386-removeifdefs arch/i386/mm/discontig.c
diff -puN include/asm-i386/mmzone.h~3_7_080_alloc_remap_i386-removeifdefs include/asm-i386/mmzone.h
diff -puN mm/page_alloc.c~3_7_080_alloc_remap_i386-removeifdefs mm/page_alloc.c
diff -puN include/linux/mmzone.h~3_7_080_alloc_remap_i386-removeifdefs include/linux/mmzone.h
diff -L linux/bootmem.h -puN /dev/null /dev/null
diff -puN include/linux/bootmem.h~3_7_080_alloc_remap_i386-removeifdefs include/linux/bootmem.h
--- sparsemem/include/linux/bootmem.h~3_7_080_alloc_remap_i386-removeifdefs	2004-10-28 10:39:14.000000000 -0700
+++ sparsemem-dave/include/linux/bootmem.h	2004-10-28 10:44:04.000000000 -0700
@@ -67,6 +67,15 @@ extern void * __init __alloc_bootmem_nod
 	__alloc_bootmem_node((pgdat), (x), PAGE_SIZE, 0)
 #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
 
+#ifdef HAVE_ARCH_ALLOC_REMAP
+extern void *alloc_remap(int nid, unsigned long size);
+#else
+static inline void *alloc_remap(int nid, unsigned long size)
+{
+	return NULL;
+}
+#endif
+
 extern unsigned long __initdata nr_kernel_pages;
 extern unsigned long __initdata nr_all_pages;
 
_