upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / mm / bootmem.c

diff --git a/mm/bootmem.c b/mm/bootmem.c
index f7d46cd..8d7ff9b 100644 (file)
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -344,31 +344,29 @@ unsigned long __init free_all_bootmem_node (pg_data_t *pgdat)
        return(free_all_bootmem_core(pgdat));
 }
 
-#ifndef CONFIG_DISCONTIGMEM
 unsigned long __init init_bootmem (unsigned long start, unsigned long pages)
 {
        max_low_pfn = pages;
        min_low_pfn = start;
-       return(init_bootmem_core(&contig_page_data, start, 0, pages));
+       return(init_bootmem_core(NODE_DATA(0), start, 0, pages));
 }
 
 #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
 void __init reserve_bootmem (unsigned long addr, unsigned long size)
 {
-       reserve_bootmem_core(contig_page_data.bdata, addr, size);
+       reserve_bootmem_core(NODE_DATA(0)->bdata, addr, size);
 }
 #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
 
 void __init free_bootmem (unsigned long addr, unsigned long size)
 {
-       free_bootmem_core(contig_page_data.bdata, addr, size);
+       free_bootmem_core(NODE_DATA(0)->bdata, addr, size);
 }
 
 unsigned long __init free_all_bootmem (void)
 {
-       return(free_all_bootmem_core(&contig_page_data));
+       return(free_all_bootmem_core(NODE_DATA(0)));
 }
-#endif /* !CONFIG_DISCONTIGMEM */
 
 void * __init __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal)
 {