2 files changed, 6 insertions, 2 deletions

diff --git a/include/linux/compaction.h b/include/linux/compaction.h
index e88c037afe47..a1fba9994728 100644
--- a/include/linux/compaction.h
+++ b/include/linux/compaction.h
@@ -6,8 +6,9 @@
  * Lower value means higher priority, analogically to reclaim priority.
  */
 enum compact_priority {
+        COMPACT_PRIO_SYNC_FULL,
+        MIN_COMPACT_PRIORITY = COMPACT_PRIO_SYNC_FULL,
         COMPACT_PRIO_SYNC_LIGHT,
-        MIN_COMPACT_PRIORITY = COMPACT_PRIO_SYNC_LIGHT,
         DEF_COMPACT_PRIORITY = COMPACT_PRIO_SYNC_LIGHT,
         COMPACT_PRIO_ASYNC,
         INIT_COMPACT_PRIORITY = COMPACT_PRIO_ASYNC
diff --git a/mm/compaction.c b/mm/compaction.c
index 2e1113ff7a03..21040304f4d2 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1644,6 +1644,8 @@ static enum compact_result compact_zone_order(struct zone *zone, int order,
                 .alloc_flags = alloc_flags,
                 .classzone_idx = classzone_idx,
                 .direct_compaction = true,
+                .whole_zone = (prio == MIN_COMPACT_PRIORITY),
+                .ignore_skip_hint = (prio == MIN_COMPACT_PRIORITY)
         };
         INIT_LIST_HEAD(&cc.freepages);
         INIT_LIST_HEAD(&cc.migratepages);
@@ -1689,7 +1691,8 @@ enum compact_result try_to_compact_pages(gfp_t gfp_mask, unsigned int order,
                                                                 ac->nodemask) {
                 enum compact_result status;
 
-                if (compaction_deferred(zone, order)) {
+                if (prio > MIN_COMPACT_PRIORITY
+                                        && compaction_deferred(zone, order)) {
                         rc = max_t(enum compact_result, COMPACT_DEFERRED, rc);
                         continue;
                 }