Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMA: make putback_lru_pages() call conditional

Browse Source 
As per documentation and other places calling putback_lru_pages(),
putback_lru_pages() is called on error only.  Make the CMA code behave
consistently.

[akpm@linux-foundation.org: remove a test-n-branch in the wrapup code]
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Srinivas Pandruvada 2013-02-22 16:32:09 -08:00 committed by Linus Torvalds
parent ffb22af5b7
commit 2a6f512412
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mm/page_alloc.c
View File

@ -5806,9 +5806,11 @@ static int __alloc_contig_migrate_range(struct compact_control *cc,
0, false, MIGRATE_SYNC, 0, false, MIGRATE_SYNC,
MR_CMA); MR_CMA);
} }
if (ret < 0) {
putback_movable_pages(&cc->migratepages); putback_movable_pages(&cc->migratepages);
return ret > 0 ? 0 : ret; return ret;
}
return 0;
} }
/** /**