aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/page_alloc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ac8fc51825bb..942498fba942 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -718,7 +718,7 @@ int move_freepages(struct zone *zone,
718{ 718{
719 struct page *page; 719 struct page *page;
720 unsigned long order; 720 unsigned long order;
721 int blocks_moved = 0; 721 int pages_moved = 0;
722 722
723#ifndef CONFIG_HOLES_IN_ZONE 723#ifndef CONFIG_HOLES_IN_ZONE
724 /* 724 /*
@@ -747,10 +747,10 @@ int move_freepages(struct zone *zone,
747 list_add(&page->lru, 747 list_add(&page->lru,
748 &zone->free_area[order].free_list[migratetype]); 748 &zone->free_area[order].free_list[migratetype]);
749 page += 1 << order; 749 page += 1 << order;
750 blocks_moved++; 750 pages_moved += 1 << order;
751 } 751 }
752 752
753 return blocks_moved; 753 return pages_moved;
754} 754}
755 755
756int move_freepages_block(struct zone *zone, struct page *page, int migratetype) 756int move_freepages_block(struct zone *zone, struct page *page, int migratetype)
@@ -833,7 +833,7 @@ static struct page *__rmqueue_fallback(struct zone *zone, int order,
833 start_migratetype); 833 start_migratetype);
834 834
835 /* Claim the whole block if over half of it is free */ 835 /* Claim the whole block if over half of it is free */
836 if ((pages << current_order) >= (1 << (MAX_ORDER-2))) 836 if (pages >= (1 << (MAX_ORDER-2)))
837 set_pageblock_migratetype(page, 837 set_pageblock_migratetype(page,
838 start_migratetype); 838 start_migratetype);
839 839