From 56a94f7f290686abbff03f8a1a3189e6297740a3 Mon Sep 17 00:00:00 2001 From: Hillf Danton Date: Tue, 10 Jan 2012 15:07:59 -0800 Subject: [PATCH] --- yaml --- r: 283014 b: refs/heads/master c: 31b8384a555d94c78e2ea2284a323cb985441f60 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/compaction.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f2529ffa8277..78f4f7592837 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3a41a5ba9c2ab988b9f1442925109dca2382fd9 +refs/heads/master: 31b8384a555d94c78e2ea2284a323cb985441f60 diff --git a/trunk/mm/compaction.c b/trunk/mm/compaction.c index 1253d7ac332b..e6670c34eb49 100644 --- a/trunk/mm/compaction.c +++ b/trunk/mm/compaction.c @@ -365,8 +365,10 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone, nr_isolated++; /* Avoid isolating too much */ - if (cc->nr_migratepages == COMPACT_CLUSTER_MAX) + if (cc->nr_migratepages == COMPACT_CLUSTER_MAX) { + ++low_pfn; break; + } } acct_isolated(zone, cc);