1 files changed, 4 insertions, 16 deletions

diff --git a/mm/bootmem.c b/mm/bootmem.c
index cbb82ee14fb5..35c32290f717 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -296,20 +296,12 @@ static unsigned long __init free_all_bootmem_core(pg_data_t *pgdat)
                 unsigned long v = ~map[i / BITS_PER_LONG];
 
                 if (gofast && v == ~0UL) {
-                        int j, order;
+                        int order;
 
                         page = pfn_to_page(pfn);
                         count += BITS_PER_LONG;
-                        __ClearPageReserved(page);
                         order = ffs(BITS_PER_LONG) - 1;
-                        set_page_refs(page, order);
-                        for (j = 1; j < BITS_PER_LONG; j++) {
-                                if (j + 16 < BITS_PER_LONG)
-                                        prefetchw(page + j + 16);
-                                __ClearPageReserved(page + j);
-                                set_page_count(page + j, 0);
-                        }
-                        __free_pages(page, order);
+                        __free_pages_bootmem(page, order);
                         i += BITS_PER_LONG;
                         page += BITS_PER_LONG;
                 } else if (v) {
@@ -319,9 +311,7 @@ static unsigned long __init free_all_bootmem_core(pg_data_t *pgdat)
                         for (m = 1; m && i < idx; m<<=1, page++, i++) {
                                 if (v & m) {
                                         count++;
-                                        __ClearPageReserved(page);
-                                        set_page_refs(page, 0);
-                                        __free_page(page);
+                                        __free_pages_bootmem(page, 0);
                                 }
                         }
                 } else {
@@ -339,9 +329,7 @@ static unsigned long __init free_all_bootmem_core(pg_data_t *pgdat)
         count = 0;
         for (i = 0; i < ((bdata->node_low_pfn-(bdata->node_boot_start >> PAGE_SHIFT))/8 + PAGE_SIZE-1)/PAGE_SIZE; i++,page++) {
                 count++;
-                __ClearPageReserved(page);
-                set_page_count(page, 1);
-                __free_page(page);
+                __free_pages_bootmem(page, 0);
         }
         total += count;
         bdata->node_bootmem_map = NULL;