diff options
Diffstat (limited to 'include/linux/memcontrol.h')
-rw-r--r-- | include/linux/memcontrol.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 73564cac38c7..159a0762aeaf 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
@@ -123,8 +123,7 @@ static inline bool mem_cgroup_disabled(void) | |||
123 | 123 | ||
124 | void mem_cgroup_update_file_mapped(struct page *page, int val); | 124 | void mem_cgroup_update_file_mapped(struct page *page, int val); |
125 | unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, | 125 | unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, |
126 | gfp_t gfp_mask, int nid, | 126 | gfp_t gfp_mask); |
127 | int zid); | ||
128 | u64 mem_cgroup_get_limit(struct mem_cgroup *mem); | 127 | u64 mem_cgroup_get_limit(struct mem_cgroup *mem); |
129 | 128 | ||
130 | #else /* CONFIG_CGROUP_MEM_RES_CTLR */ | 129 | #else /* CONFIG_CGROUP_MEM_RES_CTLR */ |
@@ -301,7 +300,7 @@ static inline void mem_cgroup_update_file_mapped(struct page *page, | |||
301 | 300 | ||
302 | static inline | 301 | static inline |
303 | unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, | 302 | unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, |
304 | gfp_t gfp_mask, int nid, int zid) | 303 | gfp_t gfp_mask) |
305 | { | 304 | { |
306 | return 0; | 305 | return 0; |
307 | } | 306 | } |