CMA: migrate mlocked pages

[thirdparty/kernel/linux.git] / mm / vmscan.c

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 8b627309dd4482ff3128d87e0f6fb2bc9173ff26..2624edcfb42095d6e91ae79c7ca30e0e4838a0fd 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1009,8 +1009,8 @@ int __isolate_lru_page(struct page *page, isolate_mode_t mode)
        if (!PageLRU(page))
                return ret;
 
-       /* Do not give back unevictable pages for compaction */
-       if (PageUnevictable(page))
+       /* Compaction should not handle unevictable pages but CMA can do so */
+       if (PageUnevictable(page) && !(mode & ISOLATE_UNEVICTABLE))
                return ret;
 
        ret = -EBUSY;