The patch titled
Subject: CMA: make putback_lru_pages() call conditional
has been added to the -mm tree. Its filename is
cma-make-putback_lru_pages-call-conditional.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
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.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
Acked-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 4 ++--
1 file changed, 2 insertions(+), 2 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
@@ -5817,8 +5817,8 @@ static int __alloc_contig_migrate_range(
0, false, MIGRATE_SYNC,
MR_CMA);
}
-
- putback_movable_pages(&cc->migratepages);
+ if (ret < 0)
+ putback_movable_pages(&cc->migratepages);
return ret > 0 ? 0 : ret;
}
_
Patches currently in -mm which might be from srinivas.pandruvada@xxxxxxxxxxxxxxx are
origin.patch
cma-make-putback_lru_pages-call-conditional.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
