| Message ID | 1348224383-1499-2-git-send-email-mgorman@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 21, 2012 at 11:46:15AM +0100, Mel Gorman wrote: > This reverts > mm-compaction-check-lock-contention-first-before-taking-lock.patch as it > is replaced by a later patch in the series. > > Signed-off-by: Mel Gorman <mgorman@suse.de> Acked-by: Rafael Aquini <aquini@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/mm/compaction.c b/mm/compaction.c index 3bb7232..4a77b4b 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -347,9 +347,8 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc, /* Time to isolate some pages for migration */ cond_resched(); - locked = compact_trylock_irqsave(&zone->lru_lock, &flags, cc); - if (!locked) - return 0; + spin_lock_irqsave(&zone->lru_lock, flags); + locked = true; for (; low_pfn < end_pfn; low_pfn++) { struct page *page;
This reverts mm-compaction-check-lock-contention-first-before-taking-lock.patch as it is replaced by a later patch in the series. Signed-off-by: Mel Gorman <mgorman@suse.de> --- mm/compaction.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)