From 942f943bcc7a4faa17e1acc0a102a69c50ab4872 Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Mon, 8 Oct 2012 16:33:51 -0700 Subject: [PATCH] --- yaml --- r: 332470 b: refs/heads/master c: beb51eaa88238daba698ad837222ad277d440b6d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 42196d6d0595..1dd6fdf32d7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e46a28790e594c0876d1a84270926abf75460f61 +refs/heads/master: beb51eaa88238daba698ad837222ad277d440b6d diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index fd86c47de86f..bb90971182bd 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -5674,7 +5674,7 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, unsigned long start, unsigned long end) { /* This function is based on compact_zone() from compaction.c. */ - + unsigned long nr_reclaimed; unsigned long pfn = start; unsigned int tries = 0; int ret = 0; @@ -5701,7 +5701,9 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, break; } - reclaim_clean_pages_from_list(cc->zone, &cc->migratepages); + nr_reclaimed = reclaim_clean_pages_from_list(cc->zone, + &cc->migratepages); + cc->nr_migratepages -= nr_reclaimed; ret = migrate_pages(&cc->migratepages, alloc_migrate_target,