From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx149.postini.com [74.125.245.149]) by kanga.kvack.org (Postfix) with SMTP id 40C3C6B004A for ; Wed, 4 Apr 2012 23:19:22 -0400 (EDT) Received: by iajr24 with SMTP id r24so1625629iaj.14 for ; Wed, 04 Apr 2012 20:19:21 -0700 (PDT) Date: Wed, 4 Apr 2012 20:19:18 -0700 (PDT) From: David Rientjes Subject: [patch] memcg swap: use mem_cgroup_uncharge_swap fix In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-linux-mm@kvack.org List-ID: To: Hugh Dickins , Andrew Morton Cc: KAMEZAWA Hiroyuki , Daisuke Nishimura , Johannes Weiner , Michal Hocko , linux-mm@kvack.org linux-next fails with this mm/memcontrol.c: In function '__mem_cgroup_commit_charge_swapin': mm/memcontrol.c:2837: error: implicit declaration of function 'mem_cgroup_uncharge_swap' if CONFIG_SWAP is disabled. Fix it. Signed-off-by: David Rientjes --- include/linux/swap.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -529,6 +529,10 @@ static inline void deactivate_swap_token(struct mm_struct *mm, bool swap_token) { } +static inline void mem_cgroup_uncharge_swap(swp_entry_t ent) +{ +} + static inline void disable_swap_token(struct mem_cgroup *memcg) { } -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org