[folded-merged] mmthpcompactioncma-allow-thp-migration-for-cma-allocations-fix.patch removed from -mm tree

[folded-merged] mmthpcompactioncma-allow-thp-migration-for-cma-allocations-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mmthpcompactioncma-allow-thp-migration-for-cma-allocations-fix
has been removed from the -mm tree.  Its filename was
     mmthpcompactioncma-allow-thp-migration-for-cma-allocations-fix.patch

This patch was dropped because it was folded into mmthpcompactioncma-allow-thp-migration-for-cma-allocations.patch

------------------------------------------------------
From: Rik van Riel <riel@surriel.com>
Subject: mmthpcompactioncma-allow-thp-migration-for-cma-allocations-fix

Mike Kravetz pointed out that the second if condition could do the
wrong thing for hugetlbfs pages, and that check really only needs
to run on THPs.

Cleanup suggested by Vlastimil.

Thank you both!

Link: http://lkml.kernel.org/r/20200228104700.0af2f18d@imladris.surriel.com
Signed-off-by: Rik van Riel <riel@surriel.com>
Suggested-by: Mike Kravetz <mike.kravetz@oracle.com>
Suggested-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: David Rientjes <rientjes@google.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Joonsoo Kim <js1304@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/page_alloc.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/mm/page_alloc.c~mmthpcompactioncma-allow-thp-migration-for-cma-allocations-fix
+++ a/mm/page_alloc.c
@@ -8292,12 +8292,12 @@ struct page *has_unmovable_pages(struct
 			struct page *head = compound_head(page);
 			unsigned int skip_pages;
 
-			if (PageHuge(page) &&
-			    !hugepage_migration_supported(page_hstate(head)))
-				return page;