Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[safe/jmp/linux-2.6] / mm / bootmem.c

diff --git a/mm/bootmem.c b/mm/bootmem.c
index 2058cb7..58c66cc 100644 (file)
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -10,6 +10,7 @@
  */
 #include <linux/init.h>
 #include <linux/pfn.h>
+#include <linux/slab.h>
 #include <linux/bootmem.h>
 #include <linux/module.h>
 #include <linux/kmemleak.h>
@@ -312,7 +313,13 @@ unsigned long __init free_all_bootmem(void)
         */
        return free_all_memory_core_early(MAX_NUMNODES);
 #else
-       return free_all_bootmem_core(NODE_DATA(0)->bdata);
+       unsigned long total_pages = 0;
+       bootmem_data_t *bdata;
+
+       list_for_each_entry(bdata, &bdata_list, list)
+               total_pages += free_all_bootmem_core(bdata);
+
+       return total_pages;
 #endif
 }