move_freepages_block() returns the number of blocks moved. This value is used
to determine if a block of pages should be stolen for the exclusive use of a
migrate type or not. However, the value returned is being used correctly.
This patch fixes the calculation to return the number of base pages that have
been moved.
This should be considered a fix to the patch
move-free-pages-between-lists-on-steal.patch
Credit to Andy Whitcroft for spotting the problem.
Signed-off-by: Mel Gorman <mel@csn.ul.ie>
Acked-by: Andy Whitcroft <apw@shadowen.org>
Acked-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
{
struct page *page;
unsigned long order;
{
struct page *page;
unsigned long order;
#ifndef CONFIG_HOLES_IN_ZONE
/*
#ifndef CONFIG_HOLES_IN_ZONE
/*
list_add(&page->lru,
&zone->free_area[order].free_list[migratetype]);
page += 1 << order;
list_add(&page->lru,
&zone->free_area[order].free_list[migratetype]);
page += 1 << order;
+ pages_moved += 1 << order;
}
int move_freepages_block(struct zone *zone, struct page *page, int migratetype)
}
int move_freepages_block(struct zone *zone, struct page *page, int migratetype)
start_migratetype);
/* Claim the whole block if over half of it is free */
start_migratetype);
/* Claim the whole block if over half of it is free */
- if ((pages << current_order) >= (1 << (MAX_ORDER-2)))
+ if (pages >= (1 << (MAX_ORDER-2)))
set_pageblock_migratetype(page,
start_migratetype);
set_pageblock_migratetype(page,
start_migratetype);