Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756096Ab0AGEKg (ORCPT ); Wed, 6 Jan 2010 23:10:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754858Ab0AGEKe (ORCPT ); Wed, 6 Jan 2010 23:10:34 -0500 Received: from TYO202.gate.nec.co.jp ([202.32.8.206]:61567 "EHLO tyo202.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753178Ab0AGEKe (ORCPT ); Wed, 6 Jan 2010 23:10:34 -0500 Date: Thu, 7 Jan 2010 13:06:31 +0900 From: Daisuke Nishimura To: Andrew Morton Cc: Randy Dunlap , KAMEZAWA Hiroyuki , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Daisuke Nishimura Subject: [PATCH -mmotm] build fix for memcg-improve-performance-in-moving-swap-charge.patch Message-Id: <20100107130631.144750c3.nishimura@mxp.nes.nec.co.jp> In-Reply-To: <20100107120233.f244d4b7.kamezawa.hiroyu@jp.fujitsu.com> References: <201001062259.o06MxQrp023236@imap1.linux-foundation.org> <20100106171058.f1d6f393.randy.dunlap@oracle.com> <20100107111319.7d95fe86.nishimura@mxp.nes.nec.co.jp> <20100107112150.2e585f1c.kamezawa.hiroyu@jp.fujitsu.com> <20100107115901.594330d0.nishimura@mxp.nes.nec.co.jp> <20100107120233.f244d4b7.kamezawa.hiroyu@jp.fujitsu.com> Organization: NEC Soft, Ltd. X-Mailer: Sylpheed 2.6.0 (GTK+ 2.10.14; i686-pc-mingw32) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1496 Lines: 40 build fix in !CONFIG_CGROUP_MEM_RES_CTLR_SWAP case. CC mm/memcontrol.o mm/memcontrol.c: In function 'mem_cgroup_move_charge_pte_range': mm/memcontrol.c:3899: error: too many arguments to function 'mem_cgroup_move_swap_account' mm/memcontrol.c:3899: error: too many arguments to function 'mem_cgroup_move_swap_account' mm/memcontrol.c:3899: error: too many arguments to function 'mem_cgroup_move_swap_account' make[1]: *** [mm/memcontrol.o] Error 1 make: *** [mm] Error 2 Reported-by: Randy Dunlap Cc: KAMEZAWA Hiroyuki Signed-off-by: Daisuke Nishimura --- This can be applied after memcg-improve-performance-in-moving-swap-charge.patch. mm/memcontrol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 5360d48..65df8d2 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2326,7 +2326,7 @@ static int mem_cgroup_move_swap_account(swp_entry_t entry, } #else static inline int mem_cgroup_move_swap_account(swp_entry_t entry, - struct mem_cgroup *from, struct mem_cgroup *to) + struct mem_cgroup *from, struct mem_cgroup *to, bool need_fixup) { return -EINVAL; } -- 1.5.6.1 -- 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/