diff --git a/[refs] b/[refs] index a667db00b591..aa0e1515e593 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e64c5237cf6ff474cb2f3f832f48f2b441dd9979 +refs/heads/master: 3cc668f4e30fbd97b3c0574d8cac7a83903c9bc7 diff --git a/trunk/mm/compaction.c b/trunk/mm/compaction.c index 0649cc1b3479..78075a268399 100644 --- a/trunk/mm/compaction.c +++ b/trunk/mm/compaction.c @@ -75,8 +75,6 @@ static bool compact_checklock_irqsave(spinlock_t *lock, unsigned long *flags, } cond_resched(); - if (fatal_signal_pending(current)) - return false; } if (!locked) @@ -363,7 +361,7 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc, /* Check if it is ok to still hold the lock */ locked = compact_checklock_irqsave(&zone->lru_lock, &flags, locked, cc); - if (!locked) + if (!locked || fatal_signal_pending(current)) break; /*