diff options
author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2012-07-31 19:42:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 21:42:41 -0400 |
commit | abb8206cb07734d0b7bf033c715995d6371a94c3 (patch) | |
tree | a27a55420bd6fad941c559bb80176f10931deb60 /include/linux/hugetlb_cgroup.h | |
parent | da1def55919f4852c4759249a78d63a0c5d2d8f9 (diff) |
hugetlb/cgroup: add hugetlb cgroup control files
Add the control files for hugetlb controller
[akpm@linux-foundation.org: s/CONFIG_CGROUP_HUGETLB_RES_CTLR/CONFIG_MEMCG_HUGETLB/g]
[akpm@linux-foundation.org: s/CONFIG_MEMCG_HUGETLB/CONFIG_CGROUP_HUGETLB/]
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hillf Danton <dhillf@gmail.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/hugetlb_cgroup.h')
-rw-r--r-- | include/linux/hugetlb_cgroup.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/hugetlb_cgroup.h b/include/linux/hugetlb_cgroup.h index 7d3fde996be..73f1e600fc1 100644 --- a/include/linux/hugetlb_cgroup.h +++ b/include/linux/hugetlb_cgroup.h | |||
@@ -62,6 +62,7 @@ extern void hugetlb_cgroup_uncharge_page(int idx, unsigned long nr_pages, | |||
62 | struct page *page); | 62 | struct page *page); |
63 | extern void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages, | 63 | extern void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages, |
64 | struct hugetlb_cgroup *h_cg); | 64 | struct hugetlb_cgroup *h_cg); |
65 | extern int hugetlb_cgroup_file_init(int idx) __init; | ||
65 | 66 | ||
66 | #else | 67 | #else |
67 | static inline struct hugetlb_cgroup *hugetlb_cgroup_from_page(struct page *page) | 68 | static inline struct hugetlb_cgroup *hugetlb_cgroup_from_page(struct page *page) |
@@ -108,5 +109,10 @@ hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages, | |||
108 | return; | 109 | return; |
109 | } | 110 | } |
110 | 111 | ||
112 | static inline int __init hugetlb_cgroup_file_init(int idx) | ||
113 | { | ||
114 | return 0; | ||
115 | } | ||
116 | |||
111 | #endif /* CONFIG_MEM_RES_CTLR_HUGETLB */ | 117 | #endif /* CONFIG_MEM_RES_CTLR_HUGETLB */ |
112 | #endif | 118 | #endif |