The patch titled
memcg: remove mem_cgroup_cache_charge_swapin()
has been added to the -mm tree. Its filename is
memcg-remove-mem_cgroup_cache_charge_swapin.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: memcg: remove mem_cgroup_cache_charge_swapin()
From: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxx>
Cc: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/swap.h | 6 ------
1 file changed, 6 deletions(-)
diff -puN include/linux/swap.h~memcg-remove-mem_cgroup_cache_charge_swapin include/linux/swap.h
--- a/include/linux/swap.h~memcg-remove-mem_cgroup_cache_charge_swapin
+++ a/include/linux/swap.h
@@ -431,12 +431,6 @@ static inline swp_entry_t get_swap_page(
#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;
-}
-
#endif /* CONFIG_SWAP */
#endif /* __KERNEL__*/
#endif /* _LINUX_SWAP_H */
_
Patches currently in -mm which might be from nishimura@xxxxxxxxxxxxxxxxx are
memcg-fix-try_get_mem_cgroup_from_swapcache.patch
memcg-fix-mem_cgroup_shrink_usage.patch
memcg-add-file-based-rss-accounting.patch
memcg-remove-mem_cgroup_cache_charge_swapin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
