From: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Date: Wed, 17 Jun 2009 23:27:15 +0000 (-0700)
Subject: memcg: remove mem_cgroup_cache_charge_swapin()
X-Git-Tag: v2.6.31-rc1~235
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=302362c5abdda80b5c2e4e57be610c2e3c2ab3c5;p=~shefty%2Frdma-dev.git

memcg: remove mem_cgroup_cache_charge_swapin()

mem_cgroup_cache_charge_swapin() isn't used any more, so remove no-op
definition of it in header file.

Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/swap.h b/include/linux/swap.h
index 0cedf31af0b..dca9b9999ae 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -423,12 +423,6 @@ static inline swp_entry_t get_swap_page(void)
 #define has_swap_token(x) 0
 #define disable_swap_token() do { } while(0)
 
-static inline int mem_cgroup_cache_charge_swapin(struct page *page,
-			struct mm_struct *mm, gfp_t mask, bool locked)
-{
-	return 0;
-}
-
 static inline void
 mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent)
 {