diff options
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 10d0f2ed9f69..5361bd078493 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -1303,7 +1303,7 @@ static void __free_pages_ok(struct page *page, unsigned int order) | |||
1303 | local_irq_restore(flags); | 1303 | local_irq_restore(flags); |
1304 | } | 1304 | } |
1305 | 1305 | ||
1306 | static void __init __free_pages_boot_core(struct page *page, unsigned int order) | 1306 | void __free_pages_core(struct page *page, unsigned int order) |
1307 | { | 1307 | { |
1308 | unsigned int nr_pages = 1 << order; | 1308 | unsigned int nr_pages = 1 << order; |
1309 | struct page *p = page; | 1309 | struct page *p = page; |
@@ -1382,7 +1382,7 @@ void __init memblock_free_pages(struct page *page, unsigned long pfn, | |||
1382 | { | 1382 | { |
1383 | if (early_page_uninitialised(pfn)) | 1383 | if (early_page_uninitialised(pfn)) |
1384 | return; | 1384 | return; |
1385 | return __free_pages_boot_core(page, order); | 1385 | __free_pages_core(page, order); |
1386 | } | 1386 | } |
1387 | 1387 | ||
1388 | /* | 1388 | /* |
@@ -1472,14 +1472,14 @@ static void __init deferred_free_range(unsigned long pfn, | |||
1472 | if (nr_pages == pageblock_nr_pages && | 1472 | if (nr_pages == pageblock_nr_pages && |
1473 | (pfn & (pageblock_nr_pages - 1)) == 0) { | 1473 | (pfn & (pageblock_nr_pages - 1)) == 0) { |
1474 | set_pageblock_migratetype(page, MIGRATE_MOVABLE); | 1474 | set_pageblock_migratetype(page, MIGRATE_MOVABLE); |
1475 | __free_pages_boot_core(page, pageblock_order); | 1475 | __free_pages_core(page, pageblock_order); |
1476 | return; | 1476 | return; |
1477 | } | 1477 | } |
1478 | 1478 | ||
1479 | for (i = 0; i < nr_pages; i++, page++, pfn++) { | 1479 | for (i = 0; i < nr_pages; i++, page++, pfn++) { |
1480 | if ((pfn & (pageblock_nr_pages - 1)) == 0) | 1480 | if ((pfn & (pageblock_nr_pages - 1)) == 0) |
1481 | set_pageblock_migratetype(page, MIGRATE_MOVABLE); | 1481 | set_pageblock_migratetype(page, MIGRATE_MOVABLE); |
1482 | __free_pages_boot_core(page, 0); | 1482 | __free_pages_core(page, 0); |
1483 | } | 1483 | } |
1484 | } | 1484 | } |
1485 | 1485 | ||