Merge tag 'for-linus-v3.11-rc1' of git://oss.sgi.com/xfs/xfs

[cascardo/linux.git] / mm / bootmem.c

diff --git a/mm/bootmem.c b/mm/bootmem.c
index eb79232..6ab7744 100644 (file)
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -263,19 +263,6 @@ void __init reset_all_zones_managed_pages(void)
        reset_managed_pages_done = 1;
 }
 
-/**
- * free_all_bootmem_node - release a node's free pages to the buddy allocator
- * @pgdat: node to be released
- *
- * Returns the number of pages actually released.
- */
-unsigned long __init free_all_bootmem_node(pg_data_t *pgdat)
-{
-       register_page_bootmem_info_node(pgdat);
-       reset_node_managed_pages(pgdat);
-       return free_all_bootmem_core(pgdat->bdata);
-}
-
 /**
  * free_all_bootmem - release free pages to the buddy allocator
  *
@@ -291,6 +278,8 @@ unsigned long __init free_all_bootmem(void)
        list_for_each_entry(bdata, &bdata_list, list)
                total_pages += free_all_bootmem_core(bdata);
 
+       totalram_pages += total_pages;
+
        return total_pages;
 }