diff --git a/[refs] b/[refs] index f525a2f38a56..f3a61c0252c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffb22af5b7a5d6c04eec22253d6d368bc8e6cd3d +refs/heads/master: 2a6f512412c7aecd04134721ea392cc496e6c017 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index d1107adf174a..804cc62ab72f 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -5806,9 +5806,11 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, 0, false, MIGRATE_SYNC, MR_CMA); } - - putback_movable_pages(&cc->migratepages); - return ret > 0 ? 0 : ret; + if (ret < 0) { + putback_movable_pages(&cc->migratepages); + return ret; + } + return 0; } /**