1 files changed, 6 insertions, 1 deletions

diff --git a/mm/compaction.c b/mm/compaction.c
index 217a6ad9a20e..56331f5124ba 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -494,8 +494,13 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc,
                         return 0;
         }
 
+        if (cond_resched()) {
+                /* Async terminates prematurely on need_resched() */
+                if (cc->mode == MIGRATE_ASYNC)
+                        return 0;
+        }
+
         /* Time to isolate some pages for migration */
-        cond_resched();
         for (; low_pfn < end_pfn; low_pfn++) {
                 /* give a chance to irqs before checking need_resched() */
                 if (locked && !(low_pfn % SWAP_CLUSTER_MAX)) {