From 2512f70c52330ac2b9c43a4a8279d8c41a0448b5 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 3 May 2012 15:43:41 +1000 Subject: [PATCH] memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix fix CONFIG_MEM_RES_CTLR_HUGETLB=n warnings include/linux/memcontrol.h:504: warning: 'struct cgroup' declared inside parameter list include/linux/memcontrol.h:504: warning: its scope is only this definition or declaration, which is probably not what you want include/linux/memcontrol.h:509: warning: 'struct cgroup' declared inside parameter list Cc: Andrea Arcangeli Cc: Aneesh Kumar K.V Cc: Hillf Danton Cc: Johannes Weiner Cc: KAMEZAWA Hiroyuki Cc: Michal Hocko Signed-off-by: Andrew Morton --- include/linux/hugetlb.h | 6 +----- include/linux/memcontrol.h | 11 ----------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index ff450b4fc417..939cff72b6b7 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -350,10 +350,6 @@ static inline unsigned int pages_per_huge_page(struct hstate *h) #ifdef CONFIG_MEM_RES_CTLR_HUGETLB extern int hugetlb_force_memcg_empty(struct cgroup *cgroup); -#else -static inline int hugetlb_force_memcg_empty(struct cgroup *cgroup) -{ - return 0; -} #endif + #endif /* _LINUX_HUGETLB_H */ diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 70317e598bf8..6a293b85f9b3 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -499,17 +499,6 @@ static inline int mem_cgroup_hugetlb_file_init(int idx) return 0; } -static inline int -mem_cgroup_move_hugetlb_parent(int idx, struct cgroup *cgroup, - struct page *page) -{ - return 0; -} - -static inline bool mem_cgroup_have_hugetlb_usage(struct cgroup *cgroup) -{ - return 0; -} #endif /* CONFIG_MEM_RES_CTLR_HUGETLB */ #endif /* _LINUX_MEMCONTROL_H */ -- 2.39.5