[Qemu-devel] [PATCH 1/9] Revert "mm: compaction: check lock contention first before taking lock"

[Mel Gorman]

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 <address@hidden>
---
 mm/compaction.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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;
 
-- 
1.7.9.2