1 files changed, 32 insertions, 0 deletions

diff --git a/mm/bootmem.c b/mm/bootmem.c
index b6791646143e..e8fb927392b9 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -461,6 +461,7 @@ void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
 
 unsigned long __init free_all_bootmem_node(pg_data_t *pgdat)
 {
+        register_page_bootmem_info_node(pgdat);
         return free_all_bootmem_core(pgdat);
 }
 
@@ -544,6 +545,37 @@ void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,
         return __alloc_bootmem(size, align, goal);
 }
 
+#ifdef CONFIG_SPARSEMEM
+void * __init alloc_bootmem_section(unsigned long size,
+                                    unsigned long section_nr)
+{
+        void *ptr;
+        unsigned long limit, goal, start_nr, end_nr, pfn;
+        struct pglist_data *pgdat;
+
+        pfn = section_nr_to_pfn(section_nr);
+        goal = PFN_PHYS(pfn);
+        limit = PFN_PHYS(section_nr_to_pfn(section_nr + 1)) - 1;
+        pgdat = NODE_DATA(early_pfn_to_nid(pfn));
+        ptr = __alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, goal,
+                                   limit);
+
+        if (!ptr)
+                return NULL;
+
+        start_nr = pfn_to_section_nr(PFN_DOWN(__pa(ptr)));
+        end_nr = pfn_to_section_nr(PFN_DOWN(__pa(ptr) + size));
+        if (start_nr != section_nr || end_nr != section_nr) {
+                printk(KERN_WARNING "alloc_bootmem failed on section %ld.\n",
+                       section_nr);
+                free_bootmem_core(pgdat->bdata, __pa(ptr), size);
+                ptr = NULL;
+        }
+
+        return ptr;
+}
+#endif
+
 #ifndef ARCH_LOW_ADDRESS_LIMIT
 #define ARCH_LOW_ADDRESS_LIMIT  0xffffffffUL
 #endif