1 files changed, 7 insertions, 4 deletions

diff --git a/mm/compaction.c b/mm/compaction.c
index 9e1b9acb116b..952dc2fb24e5 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -842,13 +842,15 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
 
                 /*
                  * Periodically drop the lock (if held) regardless of its
-                 * contention, to give chance to IRQs. Abort async compaction
-                 * if contended.
+                 * contention, to give chance to IRQs. Abort completely if
+                 * a fatal signal is pending.
                  */
                 if (!(low_pfn % SWAP_CLUSTER_MAX)
                     && compact_unlock_should_abort(&pgdat->lru_lock,
-                                            flags, &locked, cc))
-                        break;
+                                            flags, &locked, cc)) {
+                        low_pfn = 0;
+                        goto fatal_pending;
+                }
 
                 if (!pfn_valid_within(low_pfn))
                         goto isolate_fail;
@@ -1060,6 +1062,7 @@ isolate_abort:
         trace_mm_compaction_isolate_migratepages(start_pfn, low_pfn,
                                                 nr_scanned, nr_isolated);
 
+fatal_pending:
         cc->total_migrate_scanned += nr_scanned;
         if (nr_isolated)
                 count_compact_events(COMPACTISOLATED, nr_isolated);