diff --git a/mm/vmscan.c b/mm/vmscan.c
index 9ab40a6..56c3beb 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1013,8 +1013,8 @@
 	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;