From 9f7fcb476f99e3bb184dbd3f21ec9f43d37a5a3b Mon Sep 17 00:00:00 2001 From: Mel Gorman Date: Fri, 22 Feb 2013 16:32:25 -0800 Subject: [PATCH] --- yaml --- r: 356494 b: refs/heads/master c: a9aacbccf3145355190d87f0df1731fb84fdd8c8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/compaction.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3955b2783957..223b775f61f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62b726c1b3cde6ab49304e8c1af41950ed855c3c +refs/heads/master: a9aacbccf3145355190d87f0df1731fb84fdd8c8 diff --git a/trunk/mm/compaction.c b/trunk/mm/compaction.c index c62bd063d766..0d0248db36d8 100644 --- a/trunk/mm/compaction.c +++ b/trunk/mm/compaction.c @@ -611,8 +611,7 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc, continue; next_pageblock: - low_pfn += pageblock_nr_pages; - low_pfn = ALIGN(low_pfn, pageblock_nr_pages) - 1; + low_pfn = ALIGN(low_pfn + 1, pageblock_nr_pages) - 1; last_pageblock_nr = pageblock_nr; } @@ -795,7 +794,7 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone, low_pfn = max(cc->migrate_pfn, zone->zone_start_pfn); /* Only scan within a pageblock boundary */ - end_pfn = ALIGN(low_pfn + pageblock_nr_pages, pageblock_nr_pages); + end_pfn = ALIGN(low_pfn + 1, pageblock_nr_pages); /* Do not cross the free scanner or scan within a memory hole */ if (end_pfn > cc->free_pfn || !pfn_valid(low_pfn)) {