The patch titled
Subject: CMA: make putback_lru_pages() call conditional
has been removed from the -mm tree. Its filename was
cma-make-putback_lru_pages-call-conditional.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
Subject: CMA: make putback_lru_pages() call conditional
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@xxxxxxxxxxxxxxxxxxxx: remove a test-n-branch in the wrapup code]
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
Acked-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff -puN mm/page_alloc.c~cma-make-putback_lru_pages-call-conditional mm/page_alloc.c
--- a/mm/page_alloc.c~cma-make-putback_lru_pages-call-conditional
+++ a/mm/page_alloc.c
@@ -5806,9 +5806,11 @@ static int __alloc_contig_migrate_range(
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;
}
/**
_
Patches currently in -mm which might be from srinivas.pandruvada@xxxxxxxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
