summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaisuke Nishimura <nishimura@mxp.nes.nec.co.jp>2009-06-18 01:27:15 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-18 22:03:47 +0200
commit302362c5abdda80b5c2e4e57be610c2e3c2ab3c5 (patch)
treee43f21556f63115f8c038c5551fae09b6927d53b
parentmemcg: add file-based RSS accounting (diff)
downloadlinux-302362c5abdda80b5c2e4e57be610c2e3c2ab3c5.tar.xz
linux-302362c5abdda80b5c2e4e57be610c2e3c2ab3c5.zip
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>
-rw-r--r--include/linux/swap.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 0cedf31af0b0..dca9b9999aeb 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)
{