Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932990Ab0AGEJl (ORCPT ); Wed, 6 Jan 2010 23:09:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932363Ab0AGEJk (ORCPT ); Wed, 6 Jan 2010 23:09:40 -0500 Received: from TYO201.gate.nec.co.jp ([202.32.8.193]:58008 "EHLO tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756331Ab0AGEJj (ORCPT ); Wed, 6 Jan 2010 23:09:39 -0500 Date: Thu, 7 Jan 2010 13:06:09 +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-move-charges-of-anonymous-swap.patch Message-Id: <20100107130609.31fe83dc.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: 1748 Lines: 48 build fix in !CONFIG_SWAP case. CC mm/memcontrol.o mm/memcontrol.c: In function 'is_target_pte_for_mc': mm/memcontrol.c:3648: error: implicit declaration of function 'mem_cgroup_count_swap_user' 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-move-charges-of-anonymous-swap.patch. include/linux/swap.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index d9b06f7..2e1d5c9 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -287,6 +287,10 @@ extern int shmem_unuse(swp_entry_t entry, struct page *page); extern void swap_unplug_io_fn(struct backing_dev_info *, struct page *); +#ifdef CONFIG_CGROUP_MEM_RES_CTLR +extern int mem_cgroup_count_swap_user(swp_entry_t ent, struct page **pagep); +#endif + #ifdef CONFIG_SWAP /* linux/mm/page_io.c */ extern int swap_readpage(struct page *); @@ -356,7 +360,6 @@ static inline void disable_swap_token(void) #ifdef CONFIG_CGROUP_MEM_RES_CTLR extern void mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout); -extern int mem_cgroup_count_swap_user(swp_entry_t ent, struct page **pagep); #else static inline void mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout) -- 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/