From: Andrew Morton <akpm@linux-foundation.org>

include/linux/memcontrol.h:105: warning: 'mem_cgroup_try_charge' defined but not used
include/linux/memcontrol.h:111: warning: 'mem_cgroup_commit_charge_swapin' defined but not used
include/linux/memcontrol.h:114: warning: 'mem_cgroup_cancel_charge_swapin' defined but not used
include/linux/memcontrol.h:105: warning: 'mem_cgroup_try_charge' defined but not used
include/linux/memcontrol.h:111: warning: 'mem_cgroup_commit_charge_swapin' defined but not used
include/linux/memcontrol.h:114: warning: 'mem_cgroup_cancel_charge_swapin' defined but not used

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

 include/linux/memcontrol.h |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff -puN include/linux/memcontrol.h~memcg-introduce-charge-commit-cancel-style-of-functions-fix include/linux/memcontrol.h
--- a/include/linux/memcontrol.h~memcg-introduce-charge-commit-cancel-style-of-functions-fix
+++ a/include/linux/memcontrol.h
@@ -100,17 +100,18 @@ static inline int mem_cgroup_charge_migr
 	return 0;
 }
 
-static int mem_cgroup_try_charge(struct mm_struct *mm,
+static inline int mem_cgroup_try_charge(struct mm_struct *mm,
 				gfp_t gfp_mask, struct mem_cgroup **ptr)
 {
 	return 0;
 }
 
-static void mem_cgroup_commit_charge_swapin(struct page *page,
+static inline void mem_cgroup_commit_charge_swapin(struct page *page,
 					  struct mem_cgroup *ptr)
 {
 }
-static void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *ptr)
+
+static inline void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *ptr)
 {
 }
 
_