Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754154Ab0FYIbS (ORCPT ); Fri, 25 Jun 2010 04:31:18 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:40522 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751750Ab0FYIbQ (ORCPT ); Fri, 25 Jun 2010 04:31:16 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 From: KOSAKI Motohiro To: Rik van Riel , Christoph Lameter , LKML , linux-mm , Andrew Morton Subject: [PATCH] vmscan: zone_reclaim don't call disable_swap_token() Cc: kosaki.motohiro@jp.fujitsu.com Message-Id: <20100625173002.8052.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.50.07 [ja] Date: Fri, 25 Jun 2010 17:31:10 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1090 Lines: 36 Swap token don't works when zone reclaim is enabled since it was born. Because __zone_reclaim() always call disable_swap_token() unconditionally. This kill swap token feature completely. As far as I know, nobody want to that. Remove it. Cc: Rik van Riel Cc: Christoph Lameter Signed-off-by: KOSAKI Motohiro --- mm/vmscan.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 9c7e57c..0c961f1 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2590,7 +2590,6 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) }; unsigned long slab_reclaimable; - disable_swap_token(); cond_resched(); /* * We need to be able to allocate from the reserves for RECLAIM_SWAP -- 1.6.5.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/