BackMerge v4.19-rc5 into drm-next

Sean Paul requested an -rc5 backmerge from some sun4i fixes.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 05e983f42316..89d2a2ab3fe6 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7708,6 +7708,10 @@ bool has_unmovable_pages(struct zone *zone, struct page *page, int count,
                  * handle each tail page individually in migration.
                  */
                 if (PageHuge(page)) {
+
+                        if (!hugepage_migration_supported(page_hstate(page)))
+                                goto unmovable;
+
                         iter = round_up(iter + 1, 1<<compound_order(page)) - 1;
                         continue;
                 }