x86: Remove old bootmem code

[pandora-kernel.git] / arch / x86 / mm / init_32.c

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 63b09ba..c2385d7 100644 (file)
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -751,68 +751,12 @@ static void __init zone_sizes_init(void)
        free_area_init_nodes(max_zone_pfns);
 }
 
-#ifndef CONFIG_NO_BOOTMEM
-static unsigned long __init setup_node_bootmem(int nodeid,
-                                unsigned long start_pfn,
-                                unsigned long end_pfn,
-                                unsigned long bootmap)
-{
-       unsigned long bootmap_size;
-
-       /* don't touch min_low_pfn */
-       bootmap_size = init_bootmem_node(NODE_DATA(nodeid),
-                                        bootmap >> PAGE_SHIFT,
-                                        start_pfn, end_pfn);
-       printk(KERN_INFO "  node %d low ram: %08lx - %08lx\n",
-               nodeid, start_pfn<<PAGE_SHIFT, end_pfn<<PAGE_SHIFT);
-       printk(KERN_INFO "  node %d bootmap %08lx - %08lx\n",
-                nodeid, bootmap, bootmap + bootmap_size);
-       free_bootmem_with_active_regions(nodeid, end_pfn);
-
-       return bootmap + bootmap_size;
-}
-#endif
-
 void __init setup_bootmem_allocator(void)
 {
-#ifndef CONFIG_NO_BOOTMEM
-       int nodeid;
-       phys_addr_t bootmap_size, bootmap;
-       /*
-        * Initialize the boot-time allocator (with low memory only):
-        */
-       bootmap_size = bootmem_bootmap_pages(max_low_pfn)<<PAGE_SHIFT;
-       bootmap = memblock_find_in_range(0, max_pfn_mapped<<PAGE_SHIFT, bootmap_size,
-                                PAGE_SIZE);
-       if (bootmap == MEMBLOCK_ERROR)
-               panic("Cannot find bootmem map of size %ld\n", bootmap_size);
-       memblock_x86_reserve_range(bootmap, bootmap + bootmap_size, "BOOTMAP");
-#endif
-
        printk(KERN_INFO "  mapped low ram: 0 - %08lx\n",
                 max_pfn_mapped<<PAGE_SHIFT);
        printk(KERN_INFO "  low ram: 0 - %08lx\n", max_low_pfn<<PAGE_SHIFT);
 
-#ifndef CONFIG_NO_BOOTMEM
-       for_each_online_node(nodeid) {
-                unsigned long start_pfn, end_pfn;
-
-#ifdef CONFIG_NEED_MULTIPLE_NODES
-               start_pfn = node_start_pfn[nodeid];
-               end_pfn = node_end_pfn[nodeid];
-               if (start_pfn > max_low_pfn)
-                       continue;
-               if (end_pfn > max_low_pfn)
-                       end_pfn = max_low_pfn;
-#else
-               start_pfn = 0;
-               end_pfn = max_low_pfn;
-#endif
-               bootmap = setup_node_bootmem(nodeid, start_pfn, end_pfn,
-                                                bootmap);
-       }
-#endif
-
        after_bootmem = 1;
 }