From patchwork Tue Nov 30 10:15:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balbir Singh X-Patchwork-Id: 366621 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAUAFq9d005463 for ; Tue, 30 Nov 2010 10:15:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755429Ab0K3KPV (ORCPT ); Tue, 30 Nov 2010 05:15:21 -0500 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:38423 "EHLO e23smtp01.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755010Ab0K3KPS (ORCPT ); Tue, 30 Nov 2010 05:15:18 -0500 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp01.au.ibm.com (8.14.4/8.13.1) with ESMTP id oAUABwGD022283; Tue, 30 Nov 2010 21:11:58 +1100 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oAUAFHEZ778420; Tue, 30 Nov 2010 21:15:17 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id oAUAFGvr018705; Tue, 30 Nov 2010 21:15:16 +1100 Received: from localhost6.localdomain6 ([9.77.207.138]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oAUAFETp018652; Tue, 30 Nov 2010 21:15:14 +1100 Subject: [PATCH 1/3] Move zone_reclaim() outside of CONFIG_NUMA To: linux-mm@kvack.org, Christoph Lameter From: Balbir Singh Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, kvm Date: Tue, 30 Nov 2010 15:45:12 +0530 Message-ID: <20101130101506.17475.34536.stgit@localhost6.localdomain6> In-Reply-To: <20101130101126.17475.18729.stgit@localhost6.localdomain6> References: <20101130101126.17475.18729.stgit@localhost6.localdomain6> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 30 Nov 2010 10:15:52 +0000 (UTC) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 4890662..aeede91 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -302,12 +302,12 @@ struct zone { */ unsigned long lowmem_reserve[MAX_NR_ZONES]; -#ifdef CONFIG_NUMA - int node; /* * zone reclaim becomes active if more unmapped pages exist. */ unsigned long min_unmapped_pages; +#ifdef CONFIG_NUMA + int node; unsigned long min_slab_pages; #endif struct per_cpu_pageset __percpu *pageset; diff --git a/mm/vmscan.c b/mm/vmscan.c index 8cc90d5..325443a 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2644,7 +2644,6 @@ static int __init kswapd_init(void) module_init(kswapd_init) -#ifdef CONFIG_NUMA /* * Zone reclaim mode * @@ -2854,7 +2853,6 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) return ret; } -#endif /* * page_evictable - test whether a page is evictable