From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF0kn-0003YA-1q for qemu-devel@nongnu.org; Fri, 21 Sep 2012 06:46:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF0ke-0006ri-HS for qemu-devel@nongnu.org; Fri, 21 Sep 2012 06:46:36 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47255 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF0ke-0006rL-B0 for qemu-devel@nongnu.org; Fri, 21 Sep 2012 06:46:28 -0400 From: Mel Gorman Date: Fri, 21 Sep 2012 11:46:15 +0100 Message-Id: <1348224383-1499-2-git-send-email-mgorman@suse.de> In-Reply-To: <1348224383-1499-1-git-send-email-mgorman@suse.de> References: <1348224383-1499-1-git-send-email-mgorman@suse.de> Subject: [Qemu-devel] [PATCH 1/9] Revert "mm: compaction: check lock contention first before taking lock" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andrew Morton Cc: Richard Davies , KVM , QEMU-devel , LKML , Linux-MM , Avi Kivity , Shaohua Li , 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 --- 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