diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-01 14:53:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-01 14:53:27 -0400 |
| commit | 55b42b5ca2dcf143465968697fe6c6503b05fca1 (patch) | |
| tree | 91878cd53efc44ba67244d4d3897020828c87c01 /mm/compaction.c | |
| parent | 10738eeaf4ab3de092586cefcc082e7d43ca0044 (diff) | |
| parent | ec1f1276022e4e3ca40871810217d513e39ff250 (diff) | |
| download | linux-55b42b5ca2dcf143465968697fe6c6503b05fca1.tar.gz linux-55b42b5ca2dcf143465968697fe6c6503b05fca1.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/phy/marvell.c
Simple overlapping changes in drivers/net/phy/marvell.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'mm/compaction.c')
| -rw-r--r-- | mm/compaction.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/compaction.c b/mm/compaction.c index edba18aed173..ec74cf0123ef 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -784,6 +784,9 @@ isolate_migratepages_range(struct compact_control *cc, unsigned long start_pfn, cc->nr_migratepages = 0; break; } + + if (cc->nr_migratepages == COMPACT_CLUSTER_MAX) + break; } acct_isolated(cc->zone, cc); |